probably better

git-svn-id: http://svn2.nishi.boats/svn/milsko/trunk@571 b9cfdab3-6d41-4d17-bbe4-086880011989

include/Mw/BaseTypes.h

@@ -11,6 +11,7 @@ typedef struct _MwRect	    MwRect;
 typedef struct _MwSizeHints MwSizeHints;
 typedef struct _MwFont	    MwFont;
 typedef struct _MwCursor    MwCursor;
+typedef struct _MwRGB MwRGB;
 
 typedef unsigned char MwBool;
 #define MwTRUE ((MwBool)1)
@@ -104,4 +105,10 @@ struct _MwFont {
 	unsigned char data[16];
 };
 
+struct _MwRGB {
+	MwU32 red;
+	MwU32 green;
+	MwU32 blue;
+};
+
 #endif

include/Mw/ColorPicker.h

@@ -14,17 +14,13 @@
 extern "C" {
 #endif
 
-typedef struct _MwRGB MwRGB;
-
-struct _MwRGB {
-	MwU32 r;
-	MwU32 g;
-	MwU32 b;
-};
-
-typedef void (*MwColorPickerCallback)(MwRGB rgb);
-
-MWDECL MwWidget MwColorPicker(MwWidget handle, const char* title, MwColorPickerCallback cb);
+/*!
+ * @brief Creates a color picker
+ * @param handle Widget
+ * @param title Title text
+ * @return Widget
+ */
+MWDECL MwWidget MwColorPicker(MwWidget handle, const char* title);
 
 #ifdef __cplusplus
 }

include/Mw/LowLevel.h

@@ -92,7 +92,7 @@ MWDECL void MwLLPolygon(MwLL handle, MwPoint* points, int points_count, MwLLColo
 MWDECL void MwLLLine(MwLL handle, MwPoint* points, MwLLColor color);
 
 MWDECL MwLLColor MwLLAllocColor(MwLL handle, int r, int g, int b);
-MWDECL void	 MwLLColorUpdate(MwLL handle, int r, int g, int b, MwLLColor c);
+MWDECL void	 MwLLColorUpdate(MwLL handle, MwLLColor c, int r, int g, int b);
 MWDECL void	 MwLLFreeColor(MwLLColor color);
 
 MWDECL void MwLLGetXYWH(MwLL handle, int* x, int* y, unsigned int* w, unsigned int* h);

include/Mw/StringDefs.h

@@ -53,5 +53,6 @@
 #define MwNfocusInHandler "CfocusIn"	   /* NULL */
 #define MwNfocusOutHandler "CfocusOut"	   /* NULL */
 #define MwNfileChosenHandler "CfileChosen" /* char* */
+#define MwNcolorChosenHandler "CcolorChosen" /* MwRGB* */
 
 #endif