fix getting tooltip colors for GTK 2.11

[wxWidgets.git] / src / gtk1 / dcclient.cpp

diff --git a/src/gtk1/dcclient.cpp b/src/gtk1/dcclient.cpp
index a5b9b4a5d0bfc3ea5f682d53ad9b3f9ef962c728..c344069423c54e1e298a1803d56c9d7e3ed0c3f4 100644 (file)
--- a/src/gtk1/dcclient.cpp
+++ b/src/gtk1/dcclient.cpp
@@ -20,10 +20,10 @@
     #include "wx/log.h"
     #include "wx/dcmemory.h"
     #include "wx/math.h" // for floating-point functions
     #include "wx/log.h"
     #include "wx/dcmemory.h"
     #include "wx/math.h" // for floating-point functions

+    #include "wx/image.h"
+    #include "wx/module.h"

 #endif
 
 #endif
 

-#include "wx/image.h"
-#include "wx/module.h"

 #include "wx/fontutil.h"
 
 #include "wx/gtk1/win_gtk.h"
 #include "wx/fontutil.h"
 
 #include "wx/gtk1/win_gtk.h"


@@ -1606,7 +1606,7 @@ void wxWindowDC::DoDrawRotatedText( const wxString &text, wxCoord x, wxCoord y,
 void wxWindowDC::DoGetTextExtent(const wxString &string,
                                  wxCoord *width, wxCoord *height,
                                  wxCoord *descent, wxCoord *externalLeading,
 void wxWindowDC::DoGetTextExtent(const wxString &string,
                                  wxCoord *width, wxCoord *height,
                                  wxCoord *descent, wxCoord *externalLeading,

-                                 wxFont *theFont) const
+                                 const wxFont *theFont) const

 {
     if ( width )
         *width = 0;
 {
     if ( width )
         *width = 0;