diff options
| author | Travis CI <zmoelnig@travis-ci.umlaeute.mur.at> | 2018-09-09 20:00:21 +0000 |
|---|---|---|
| committer | Travis CI <zmoelnig@travis-ci.umlaeute.mur.at> | 2018-09-09 20:00:21 +0000 |
| commit | 0dad53f6bbcab0ab55f963b0696ffe434b098e78 (patch) | |
| tree | 96bf5164997d103a8c7c9c07bc5d07034bca68bb /Gem/develop | |
| parent | cac14373442ad015c587a3aadb735c4f4334c02f (diff) | |
Gem 504da729f28c5fe72528b5455e410a77245a37d4 osx/i386
built 'master:504da729f28c5fe72528b5455e410a77245a37d4' for osx/i386
Diffstat (limited to 'Gem/develop')
| -rw-r--r-- | Gem/develop/include/Gem/Base/CPPExtern.h | 2 | ||||
| -rw-r--r-- | Gem/develop/include/Gem/Gem/Event.h | 4 | ||||
| -rw-r--r-- | Gem/develop/include/Gem/Gem/Image.h | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/Gem/develop/include/Gem/Base/CPPExtern.h b/Gem/develop/include/Gem/Base/CPPExtern.h index 4523eef..de320f9 100644 --- a/Gem/develop/include/Gem/Base/CPPExtern.h +++ b/Gem/develop/include/Gem/Base/CPPExtern.h @@ -116,7 +116,7 @@ public: ////////// // my name - static char *m_holdname; + static const char *m_holdname; t_symbol *m_objectname; protected: diff --git a/Gem/develop/include/Gem/Gem/Event.h b/Gem/develop/include/Gem/Gem/Event.h index 6024ec8..1200296 100644 --- a/Gem/develop/include/Gem/Gem/Event.h +++ b/Gem/develop/include/Gem/Gem/Event.h @@ -71,7 +71,7 @@ GEM_EXTERN extern void removeWheelCallback(WHEEL_CB callback, void *data); // Keyboard callback // ////////////////////////////////////////////////////////////////// -typedef void (*KEYBOARD_CB)(char *,int, int, void *); +typedef void (*KEYBOARD_CB)(const char *,int, int, void *); ////////// // Set a keyboard callback GEM_EXTERN extern void setKeyboardCallback(KEYBOARD_CB callback, @@ -103,7 +103,7 @@ GEM_EXTERN extern void triggerMotionEvent(int x, int y); GEM_EXTERN extern void triggerButtonEvent(int which, int state, int x, int y); GEM_EXTERN extern void triggerWheelEvent(int axis, int value); -GEM_EXTERN extern void triggerKeyboardEvent(char *string, int value, +GEM_EXTERN extern void triggerKeyboardEvent(const char *string, int value, int state); GEM_EXTERN extern void triggerResizeEvent(int xSize, int ySize); diff --git a/Gem/develop/include/Gem/Gem/Image.h b/Gem/develop/include/Gem/Gem/Image.h index 6bad705..bf61aef 100644 --- a/Gem/develop/include/Gem/Gem/Image.h +++ b/Gem/develop/include/Gem/Gem/Image.h @@ -289,11 +289,11 @@ struct GEM_EXTERN pixBlock { /////////////////////////////////////////////////////////////////////////////// ////////// // copies all of the data over and mallocs memory -GEM_EXTERN extern void copy2Image(imageStruct *to, imageStruct *from); +GEM_EXTERN extern void copy2Image(imageStruct *to, const imageStruct *from); ////////// // assumes that it only has to refresh the data -GEM_EXTERN extern void refreshImage(imageStruct *to, imageStruct *from); +GEM_EXTERN extern void refreshImage(imageStruct *to, const imageStruct *from); -GEM_EXTERN extern int getPixFormat(char*); +GEM_EXTERN extern int getPixFormat(const char*); #endif // GEMPIXUTIL_H_ |