& operator should be &&

[wxWidgets.git] / src / motif / window.cpp

diff --git a/src/motif/window.cpp b/src/motif/window.cpp
index ab65b8786c163e5411684fa143737edaf9780213..865e4272fb110a50a56aaaffd9839b4e845f98bc 100644 (file)
--- a/src/motif/window.cpp
+++ b/src/motif/window.cpp
@@ -26,12 +26,16 @@
 #define XtScreen XTSCREEN
 #endif
 
 #define XtScreen XTSCREEN
 #endif
 

-#include "wx/setup.h"
+#ifndef WX_PRECOMP
+    #include "wx/hash.h"
+    #include "wx/log.h"
+    #include "wx/app.h"
+#endif
+

 #include "wx/menu.h"
 #include "wx/dc.h"
 #include "wx/dcclient.h"
 #include "wx/utils.h"
 #include "wx/menu.h"
 #include "wx/dc.h"
 #include "wx/dcclient.h"
 #include "wx/utils.h"

-#include "wx/app.h"

 #include "wx/layout.h"
 #include "wx/button.h"
 #include "wx/settings.h"
 #include "wx/layout.h"
 #include "wx/button.h"
 #include "wx/settings.h"


@@ -39,9 +43,7 @@
 #include "wx/scrolwin.h"
 #include "wx/module.h"
 #include "wx/menuitem.h"
 #include "wx/scrolwin.h"
 #include "wx/module.h"
 #include "wx/menuitem.h"

-#include "wx/log.h"

 #include "wx/evtloop.h"
 #include "wx/evtloop.h"

-#include "wx/hash.h"

 
 #if  wxUSE_DRAG_AND_DROP
     #include "wx/dnd.h"
 
 #if  wxUSE_DRAG_AND_DROP
     #include "wx/dnd.h"


@@ -694,7 +696,7 @@ bool wxWindow::SetCursor(const wxCursor& cursor)
 
     //    wxASSERT_MSG( m_cursor.Ok(),
     //                  wxT("cursor must be valid after call to the base version"));
 
     //    wxASSERT_MSG( m_cursor.Ok(),
     //                  wxT("cursor must be valid after call to the base version"));

-    wxCursor* cursor2 = NULL;
+    const wxCursor* cursor2 = NULL;

     if (m_cursor.Ok())
         cursor2 = & m_cursor;
     else
     if (m_cursor.Ok())
         cursor2 = & m_cursor;
     else


@@ -1248,6 +1250,7 @@ void wxWindow::DoSetSizeIntr(int x, int y, int width, int height,
 {
     // A bit of optimization to help sort out the flickers.
     int oldX = -1, oldY = -1, oldW = -1, oldH = -1;
 {
     // A bit of optimization to help sort out the flickers.
     int oldX = -1, oldY = -1, oldW = -1, oldH = -1;

+

     if( !fromCtor )
     {
         GetSize(& oldW, & oldH);
     if( !fromCtor )
     {
         GetSize(& oldW, & oldH);


@@ -2378,7 +2381,7 @@ bool wxTranslateKeyEvent(wxKeyEvent& wxevent, wxWindow *win,
 
 #define YAllocColor XAllocColor
 XColor g_itemColors[5];
 
 #define YAllocColor XAllocColor
 XColor g_itemColors[5];

-int wxComputeColours (Display *display, wxColour * back, wxColour * fore)
+int wxComputeColours (Display *display, const wxColour * back, const wxColour * fore)

 {
     int result;
     static XmColorProc colorProc;
 {
     int result;
     static XmColorProc colorProc;


@@ -2492,7 +2495,7 @@ void wxWindow::ChangeFont(bool keepOriginalSize)
         GetSize(& width1, & height1);
         if (keepOriginalSize && (width != width1 || height != height1))
         {
         GetSize(& width1, & height1);
         if (keepOriginalSize && (width != width1 || height != height1))
         {

-            SetSize(-1, -1, width, height);
+            SetSize(wxDefaultCoord, wxDefaultCoord, width, height);

         }
     }
 }
         }
     }
 }