avoid g++ 4.3 warnings about conflict between parameter and method names (closes...

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

diff --git a/include/wx/x11/window.h b/include/wx/x11/window.h
index b28d6706e5c6fb3639173625ef64bcade3dc304e..a958feb093719004a2b19ec4f6fa75235da99eb3 100644 (file)
--- a/include/wx/x11/window.h
+++ b/include/wx/x11/window.h
@@ -73,13 +73,13 @@ public:
     virtual int GetCharWidth() const;
     virtual void GetTextExtent(const wxString& string,
         int *x, int *y,
     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;
 
     virtual void ScrollWindow( int dx, int dy,
         const wxFont *theFont = (const wxFont *) NULL)
         const;
 
     virtual void ScrollWindow( int dx, int dy,

-        const wxRect* rect = (wxRect *) NULL );
+        const wxRect* rect = NULL );

 
 #if wxUSE_DRAG_AND_DROP
     virtual void SetDropTarget( wxDropTarget *dropTarget );
 
 #if wxUSE_DRAG_AND_DROP
     virtual void SetDropTarget( wxDropTarget *dropTarget );


@@ -190,7 +190,7 @@ private:
     void Init();
 
     DECLARE_DYNAMIC_CLASS(wxWindowX11)
     void Init();
 
     DECLARE_DYNAMIC_CLASS(wxWindowX11)

-    DECLARE_NO_COPY_CLASS(wxWindowX11)
+    wxDECLARE_NO_COPY_CLASS(wxWindowX11);

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };