rename wxGrid::SendSizeEvent() to SendGridSizeEvent() to avoid warnings about conflic...

[wxWidgets.git] / include / wx / mgl / window.h

diff --git a/include/wx/mgl/window.h b/include/wx/mgl/window.h
index e47e113bfc62e01cd84299ca3ae2b3c00dcc7fad..409197a61e7d0b046afa69831dc9f0e21b59e8a5 100644 (file)
--- a/include/wx/mgl/window.h
+++ b/include/wx/mgl/window.h
@@ -76,8 +76,8 @@ public:
     virtual int GetCharWidth() const;
     virtual void GetTextExtent(const wxString& string,
                                int *x, int *y,
-                               int *descent = (int *) NULL,
-                               int *externalLeading = (int *) NULL,
+                               int *descent = NULL,
+                               int *externalLeading = NULL,
                                const wxFont *theFont = (const wxFont *) NULL)
                                const;
 
@@ -139,7 +139,7 @@ private:
     friend class wxPaintDC;
 
     DECLARE_DYNAMIC_CLASS(wxWindowMGL)
-    DECLARE_NO_COPY_CLASS(wxWindowMGL)
+    wxDECLARE_NO_COPY_CLASS(wxWindowMGL);
     DECLARE_EVENT_TABLE()
 
 public: