implement support for button bitmaps (normal state only for now) for wxGTK

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

diff --git a/src/mgl/window.cpp b/src/mgl/window.cpp
index ac24d5b5dcb1d7d9e76448c99f7ab6dbaee7ab15..f9a1505ff3a0d625d6340f282728cfd35b4ee660 100644 (file)
--- a/src/mgl/window.cpp
+++ b/src/mgl/window.cpp
@@ -1079,10 +1079,11 @@ int wxWindowMGL::GetCharWidth() const
     return dc.GetCharWidth();
 }
 
-void wxWindowMGL::GetTextExtent(const wxString& string,
-                             int *x, int *y,
-                             int *descent, int *externalLeading,
-                             const wxFont *theFont) const
+void wxWindowMGL::DoGetTextExtent(const wxString& string,
+                                  int *x, int *y,
+                                  int *descent,
+                                  int *externalLeading,
+                                  const wxFont *theFont) const
 {
     wxScreenDC dc;
     if (!theFont)
@@ -1139,7 +1140,7 @@ void wxWindowMGL::HandlePaint(MGLDevCtx *dc)
         return;
     }
 
-#ifdef __WXDEBUG__
+#if wxDEBUG_LEVEL >= 2
     // FIXME_MGL -- debugging stuff, to be removed!
     static int debugPaintEvents = -1;
     if ( debugPaintEvents == -1 )
@@ -1150,7 +1151,7 @@ void wxWindowMGL::HandlePaint(MGLDevCtx *dc)
         dc->fillRect(-1000,-1000,2000,2000);
         wxMilliSleep(50);
     }
-#endif
+#endif // wxDEBUG_LEVEL >= 2
 
     MGLRegion clip;
     dc->getClipRegion(clip);