Add wxDataFormat GetMatchingPair() which wxGTK and wxMSW already had under different...

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

diff --git a/include/wx/mgl/window.h b/include/wx/mgl/window.h
index 738bc927fb02cce587f1365a4caa8fc303346c5a..f89bfe3bc533a05c8f3a255168697cc4a1f6645c 100644 (file)
--- a/include/wx/mgl/window.h
+++ b/include/wx/mgl/window.h
@@ -23,7 +23,7 @@ class MGLDevCtx;
 // wxWindow declaration for MGL
 // ---------------------------------------------------------------------------
 
-class WXDLLEXPORT wxWindowMGL : public wxWindowBase
+class WXDLLIMPEXP_CORE wxWindowMGL : public wxWindowBase
 {
 public:
     wxWindowMGL() { Init(); }
@@ -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;