fix getting tooltip colors for GTK 2.11

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

diff --git a/src/x11/dcscreen.cpp b/src/x11/dcscreen.cpp
index cd776d963dedbbde5c7825386cd39e62b4eca206..8bcb5f410b7437c2321efabdce6be362c582e42c 100644 (file)
--- a/src/x11/dcscreen.cpp
+++ b/src/x11/dcscreen.cpp
@@ -1,19 +1,26 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

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

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

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

-#include "wx/window.h"
-#include "wx/frame.h"
+// for compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+

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

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

 #include "wx/fontutil.h"
 
 #include "wx/x11/private.h"
 #include "wx/fontutil.h"
 
 #include "wx/x11/private.h"


@@ -34,16 +41,16 @@ IMPLEMENT_DYNAMIC_CLASS(wxScreenDC,wxPaintDC)
 
 wxScreenDC::wxScreenDC()
 {
 
 wxScreenDC::wxScreenDC()
 {

-    m_ok = FALSE;
-    
+    m_ok = false;
+

     m_display = (WXDisplay *) wxGlobalDisplay();
     m_display = (WXDisplay *) wxGlobalDisplay();

-    
+

     int screen = DefaultScreen( (Display*) m_display );
     m_cmap = (WXColormap) DefaultColormap( (Display*) m_display, screen );
     int screen = DefaultScreen( (Display*) m_display );
     m_cmap = (WXColormap) DefaultColormap( (Display*) m_display, screen );

-    
+

     m_window = (WXWindow) RootWindow( (Display*) m_display, screen );
 
     m_window = (WXWindow) RootWindow( (Display*) m_display, screen );
 

-    m_isScreenDC = TRUE;
+    m_isScreenDC = true;

 
 #if wxUSE_UNICODE
     m_context = wxTheApp->GetPangoContext();
 
 #if wxUSE_UNICODE
     m_context = wxTheApp->GetPangoContext();


@@ -107,12 +114,12 @@ bool wxScreenDC::StartDrawingOnTop( wxRect *rectIn )
     }
 #endif // 0
 
     }
 #endif // 0
 

-    return TRUE;
+    return true;

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

-    return TRUE;
+    return true;

 }
 
 void wxScreenDC::DoGetSize(int *width, int *height) const
 }
 
 void wxScreenDC::DoGetSize(int *width, int *height) const