tiny change to make g++ 3.3 compile the latest version

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

diff --git a/src/motif/dcscreen.cpp b/src/motif/dcscreen.cpp
index 62d1cbc8b828dd4a5ed8bf32e3542ed5efa40a5f..360acdfe141e75b8633f2b1fe1b3bfcaa63dbbe7 100644 (file)
--- a/src/motif/dcscreen.cpp
+++ b/src/motif/dcscreen.cpp
@@ -1,22 +1,24 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dcscreen.cpp
+// Name:        src/motif/dcscreen.cpp

 // Purpose:     wxScreenDC class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Purpose:     wxScreenDC class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "dcscreen.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 

-#include "wx/window.h"
-#include "wx/frame.h"

 #include "wx/dcscreen.h"
 #include "wx/dcscreen.h"

-#include "wx/utils.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+    #include "wx/window.h"
+    #include "wx/frame.h"
+#endif

 
 #ifdef __VMS__
 #pragma message disable nosimpint
 
 #ifdef __VMS__
 #pragma message disable nosimpint


@@ -39,7 +41,7 @@ wxScreenDC::wxScreenDC()
 {
     m_display = wxGetDisplay();
     Display* display = (Display*) m_display;
 {
     m_display = wxGetDisplay();
     Display* display = (Display*) m_display;

-    
+

     if (sm_overlayWindow)
     {
         m_pixmap = sm_overlayWindow;
     if (sm_overlayWindow)
     {
         m_pixmap = sm_overlayWindow;


@@ -48,7 +50,7 @@ wxScreenDC::wxScreenDC()
     }
     else
         m_pixmap = (WXPixmap) RootWindow(display, DefaultScreen(display));
     }
     else
         m_pixmap = (WXPixmap) RootWindow(display, DefaultScreen(display));

-    
+

     XGCValues gcvalues;
     gcvalues.foreground = BlackPixel (display, DefaultScreen (display));
     gcvalues.background = WhitePixel (display, DefaultScreen (display));
     XGCValues gcvalues;
     gcvalues.foreground = BlackPixel (display, DefaultScreen (display));
     gcvalues.background = WhitePixel (display, DefaultScreen (display));


@@ -58,9 +60,9 @@ wxScreenDC::wxScreenDC()
     m_gc = XCreateGC (display, RootWindow (display, DefaultScreen (display)),
         GCForeground | GCBackground | GCGraphicsExposures | GCLineWidth | GCSubwindowMode,
         &gcvalues);
     m_gc = XCreateGC (display, RootWindow (display, DefaultScreen (display)),
         GCForeground | GCBackground | GCGraphicsExposures | GCLineWidth | GCSubwindowMode,
         &gcvalues);

-    
-    m_backgroundPixel = (int) gcvalues.background;
-    m_ok = TRUE;
+
+    m_backgroundPixel = gcvalues.background;
+    m_ok = true;

 }
 
 wxScreenDC::~wxScreenDC()
 }
 
 wxScreenDC::~wxScreenDC()


@@ -78,23 +80,23 @@ bool wxScreenDC::StartDrawingOnTop(wxWindow* window)
     window->GetSize(& width, & height);
     rect.x = x; rect.y = y;
     rect.width = width; rect.height = height;
     window->GetSize(& width, & height);
     rect.x = x; rect.y = y;
     rect.width = width; rect.height = height;

-    
+

     return StartDrawingOnTop(& rect);
 }
 
 bool wxScreenDC::StartDrawingOnTop(wxRect* rect)
 {
     if (sm_overlayWindow)
     return StartDrawingOnTop(& rect);
 }
 
 bool wxScreenDC::StartDrawingOnTop(wxRect* rect)
 {
     if (sm_overlayWindow)

-        return FALSE;
-    
+        return false;
+

     Display *dpy = (Display*) wxGetDisplay();
     Pixmap screenPixmap = RootWindow(dpy, DefaultScreen(dpy));
     Display *dpy = (Display*) wxGetDisplay();
     Pixmap screenPixmap = RootWindow(dpy, DefaultScreen(dpy));

-    
+

     int x = 0;
     int y = 0;
     int width, height;
     wxDisplaySize(&width, &height);
     int x = 0;
     int y = 0;
     int width, height;
     wxDisplaySize(&width, &height);

-    
+

     if (rect)
     {
         x = rect->x; y = rect->y;
     if (rect)
     {
         x = rect->x; y = rect->y;


@@ -102,23 +104,23 @@ bool wxScreenDC::StartDrawingOnTop(wxRect* rect)
     }
     sm_overlayWindowX = x;
     sm_overlayWindowY = y;
     }
     sm_overlayWindowX = x;
     sm_overlayWindowY = y;

-    
+

     XSetWindowAttributes attributes;
     attributes.override_redirect = True;
     unsigned long valueMask = CWOverrideRedirect;
     XSetWindowAttributes attributes;
     attributes.override_redirect = True;
     unsigned long valueMask = CWOverrideRedirect;

-    
+

     sm_overlayWindow = (WXWindow) XCreateWindow(dpy, screenPixmap, x, y, width, height, 0,
         wxDisplayDepth(), InputOutput,
         DefaultVisual(dpy, 0), valueMask,
         & attributes);
     sm_overlayWindow = (WXWindow) XCreateWindow(dpy, screenPixmap, x, y, width, height, 0,
         wxDisplayDepth(), InputOutput,
         DefaultVisual(dpy, 0), valueMask,
         & attributes);

-    
+

     if (sm_overlayWindow)
     {
         XMapWindow(dpy, (Window) sm_overlayWindow);
     if (sm_overlayWindow)
     {
         XMapWindow(dpy, (Window) sm_overlayWindow);

-        return TRUE;
+        return true;

     }
     else
     }
     else

-        return FALSE;
+        return false;

 }
 
 bool wxScreenDC::EndDrawingOnTop()
 }
 
 bool wxScreenDC::EndDrawingOnTop()


@@ -127,8 +129,8 @@ bool wxScreenDC::EndDrawingOnTop()
     {
         XDestroyWindow((Display*) wxGetDisplay(), (Window) sm_overlayWindow);
         sm_overlayWindow = 0;
     {
         XDestroyWindow((Display*) wxGetDisplay(), (Window) sm_overlayWindow);
         sm_overlayWindow = 0;

-        return TRUE;
+        return true;

     }
     else
     }
     else

-        return FALSE;
+        return false;

 }
 }