X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b2e10daccc99be6d3ca7a206c69e94d3bfe6b03d..2d14a14c573db4b8f8959b1460a269cf23defbcf:/include/wx/x11/window.h

diff --git a/include/wx/x11/window.h b/include/wx/x11/window.h
index 6c04d16eac..a958feb093 100644
--- 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,
-        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 wxRect* rect = (wxRect *) NULL );
+        const wxRect* rect = NULL );
 
 #if wxUSE_DRAG_AND_DROP
     virtual void SetDropTarget( wxDropTarget *dropTarget );
@@ -190,7 +190,7 @@ private:
     void Init();
 
     DECLARE_DYNAMIC_CLASS(wxWindowX11)
-    DECLARE_NO_COPY_CLASS(wxWindowX11)
+    wxDECLARE_NO_COPY_CLASS(wxWindowX11);
     DECLARE_EVENT_TABLE()
 };
 
@@ -205,7 +205,7 @@ private:
 // optimisation, it will be reenabled as soon as the object goes out from scope.
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxNoOptimize
+class WXDLLIMPEXP_CORE wxNoOptimize
 {
 public:
     wxNoOptimize() { ms_count++; }