use the native wxImageList under Win32 as otherwise xUniv doesn't link currently

[wxWidgets.git] / include / wx / motif / private.h

diff --git a/include/wx/motif/private.h b/include/wx/motif/private.h
index 23737aecba2a2ee04ed8f00fc0cbc71d43eb4420..9f0c237bf3e0d61d0e16ee87e70eddd28440d565 100644 (file)
--- a/include/wx/motif/private.h
+++ b/include/wx/motif/private.h
@@ -13,6 +13,7 @@
 #define _WX_PRIVATE_H_
 
 #include "wx/defs.h"
 #define _WX_PRIVATE_H_
 
 #include "wx/defs.h"

+#include "X11/Xlib.h"

 
 class wxMouseEvent;
 class wxKeyEvent;
 
 class wxMouseEvent;
 class wxKeyEvent;


@@ -90,15 +91,15 @@ public:
     wxXmString(const wxString& str)
     {
         m_string = XmStringCreateLtoR((char *)str.c_str(),
     wxXmString(const wxString& str)
     {
         m_string = XmStringCreateLtoR((char *)str.c_str(),

-                                      XmSTRING_DEFAULT_CHARSET);
+            XmSTRING_DEFAULT_CHARSET);

     }
     }

-
+    

     ~wxXmString() { XmStringFree(m_string); }
     ~wxXmString() { XmStringFree(m_string); }

-
+    

     // semi-implicit conversion to XmString (shouldn't rely on implicit
     // conversion because many of Motif functions are macros)
     XmString operator()() const { return m_string; }
     // semi-implicit conversion to XmString (shouldn't rely on implicit
     // conversion because many of Motif functions are macros)
     XmString operator()() const { return m_string; }

-
+    

 private:
     XmString m_string;
 };
 private:
     XmString m_string;
 };


@@ -116,5 +117,24 @@ private:
 
 extern "C" XtAppContext wxGetAppContext();
 
 
 extern "C" XtAppContext wxGetAppContext();
 

+#define wxMAX_RGB           0xff
+#define wxMAX_SV            1000
+#define wxSIGN(x)           ((x < 0) ? -x : x)
+#define wxH_WEIGHT          4
+#define wxS_WEIGHT          1
+#define wxV_WEIGHT          2
+
+typedef struct wx_hsv {
+                        int h,s,v;
+                      } wxHSV;
+
+#define wxMax3(x,y,z) ((x > y) ? ((x > z) ? x : z) : ((y > z) ? y : z))
+#define wxMin3(x,y,z) ((x < y) ? ((x < z) ? x : z) : ((y < z) ? y : z))
+
+void wxHSVToXColor(wxHSV *hsv,XColor *xcolor);
+void wxXColorToHSV(wxHSV *hsv,XColor *xcolor);
+void wxAllocNearestColor(Display *display,Colormap colormap,XColor *xcolor);
+void wxAllocColor(Display *display,Colormap colormap,XColor *xcolor);
+

 #endif
 #endif

-    // _WX_PRIVATE_H_
+// _WX_PRIVATE_H_