Typo fix for GetSizer.

[wxWidgets.git] / src / x11 / utils.cpp

diff --git a/src/x11/utils.cpp b/src/x11/utils.cpp
index c85fcac9ef73f0584c93f761c941729a36246d7e..fc15ff0ce18e9336a9b6bccf17efad4ad88a90f8 100644 (file)
--- a/src/x11/utils.cpp
+++ b/src/x11/utils.cpp
@@ -45,17 +45,10 @@
 #pragma message disable nosimpint
 #endif
 
 #pragma message disable nosimpint
 #endif
 

-#ifdef __WXMOTIF__
-#include <Xm/Xm.h>
-#endif
-
-#ifdef __VMS__
-#pragma message enable nosimpint
-#endif
-

 #include "wx/unix/execute.h"
 
 #ifdef __WXMOTIF__
 #include "wx/unix/execute.h"
 
 #ifdef __WXMOTIF__

+#include <Xm/Xm.h>

 #include "wx/motif/private.h"
 #endif
 
 #include "wx/motif/private.h"
 #endif
 


@@ -63,9 +56,16 @@
 #include "wx/x11/private.h"
 #endif
 
 #include "wx/x11/private.h"
 #endif
 

+#if wxUSE_RESOURCES

 #include "X11/Xresource.h"
 #include "X11/Xresource.h"

+#endif
+

 #include "X11/Xutil.h"
 
 #include "X11/Xutil.h"
 

+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif
+

 // ----------------------------------------------------------------------------
 // private functions
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // private functions
 // ----------------------------------------------------------------------------


@@ -568,6 +568,11 @@ wxSetDefaultResources (const Widget w, const char **resourceSpec, const char *na
 
 void wxGetMousePosition( int* x, int* y )
 {
 
 void wxGetMousePosition( int* x, int* y )
 {

+#if wxUSE_NANOX
+    // TODO
+    *x = 0;
+    *y = 0;
+#else

     XMotionEvent xev;
     Window root, child;
     XQueryPointer((Display*) wxGetDisplay(),
     XMotionEvent xev;
     Window root, child;
     XQueryPointer((Display*) wxGetDisplay(),


@@ -578,6 +583,7 @@ void wxGetMousePosition( int* x, int* y )
                   &(xev.state));
     *x = xev.x_root;
     *y = xev.y_root;
                   &(xev.state));
     *x = xev.x_root;
     *y = xev.y_root;

+#endif

 };
 
 // Return TRUE if we have a colour display
 };
 
 // Return TRUE if we have a colour display


@@ -683,7 +689,7 @@ bool wxSetDisplay(const wxString& display_name)
             return FALSE;
 #endif
 #ifdef __WXX11__
             return FALSE;
 #endif
 #ifdef __WXX11__

-        Display* display = XOpenDisplay((const char*) display_name);
+        Display* display = XOpenDisplay((char*) display_name.c_str());

 
         if (display)
         {
 
         if (display)
         {


@@ -1015,6 +1021,7 @@ void wxXColorToHSV(wxHSV *hsv,XColor *rgb)
 
 void wxAllocNearestColor(Display *d,Colormap cmp,XColor *xc)
 {
 
 void wxAllocNearestColor(Display *d,Colormap cmp,XColor *xc)
 {

+#if !wxUSE_NANOX

     int llp;
 
     int screen = DefaultScreen(d);
     int llp;
 
     int screen = DefaultScreen(d);


@@ -1051,6 +1058,7 @@ void wxAllocNearestColor(Display *d,Colormap cmp,XColor *xc)
 */
 
     delete[] color_defs;
 */
 
     delete[] color_defs;

+#endif

 }
 
 void wxAllocColor(Display *d,Colormap cmp,XColor *xc)
 }
 
 void wxAllocColor(Display *d,Colormap cmp,XColor *xc)


@@ -1065,6 +1073,10 @@ void wxAllocColor(Display *d,Colormap cmp,XColor *xc)
 #ifdef __WXDEBUG__
 wxString wxGetXEventName(XEvent& event)
 {
 #ifdef __WXDEBUG__
 wxString wxGetXEventName(XEvent& event)
 {

+#if wxUSE_NANOX
+    wxString str(wxT("(some event)"));
+    return str;
+#else

     int type = event.xany.type;
            static char* event_name[] = {
                "", "unknown(-)",                                         // 0-1
     int type = event.xany.type;
            static char* event_name[] = {
                "", "unknown(-)",                                         // 0-1


@@ -1082,7 +1094,8 @@ wxString wxGetXEventName(XEvent& event)
            type = wxMin(35, type); type = wxMax(1, type);
         wxString str(event_name[type]);
         return str;
            type = wxMin(35, type); type = wxMax(1, type);
         wxString str(event_name[type]);
         return str;

-       }
+#endif
+}

 #endif
 
 #ifdef __WXMOTIF__
 #endif
 
 #ifdef __WXMOTIF__