fix the wrong #ifdef WXWIN_COMPATIBILITY_2_8 checks, #if should be used (#9644)

[wxWidgets.git] / include / wx / motif / toplevel.h

diff --git a/include/wx/motif/toplevel.h b/include/wx/motif/toplevel.h
index 700e52a40f7b84fd06bbd9a5512efa31e270acca..4144b83a3a48952156a0dcd1fccc889f031027f8 100644 (file)
--- a/include/wx/motif/toplevel.h
+++ b/include/wx/motif/toplevel.h
@@ -12,10 +12,6 @@
 #ifndef __MOTIFTOPLEVELH__
 #define __MOTIFTOPLEVELH__
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "toplevel.h"
-#endif
-
 class WXDLLIMPEXP_CORE wxTopLevelWindowMotif : public wxTopLevelWindowBase
 {
 public:
@@ -56,10 +52,6 @@ public:
     virtual wxString GetTitle() const { return m_title; }
     virtual void SetTitle( const wxString& title ) { m_title = title; }
 
-    virtual void DoSetSizeHints( int minW, int minH,
-                               int maxW = -1, int maxH = -1,
-                               int incW = -1, int incH = -1 );
-
     virtual bool SetShape( const wxRegion& region );
 
     WXWidget GetShellWidget() const;
@@ -70,16 +62,13 @@ protected:
     void PreDestroy();
 
     virtual void DoGetPosition(int* x, int* y) const;
+    virtual void DoSetSizeHints(int minW, int minH,
+                                int maxW, int maxH,
+                                int incW, int incH);
 
 private:
-#if wxCHECK_VERSION(2,7,0)
-    // DoDestroy() is not used anywhere else, DoCreate() should also be renamed
-    // in src/motif/dialog.cpp, frame.cpp and toplevel.cp
-    #error "Remove DoDestroy() and rename DoCreate() to XmDoCreateTLW(), they were only kept for binary backwards compatibility"
-#endif
-
     // really create the Motif widget for TLW
-    virtual bool DoCreate(wxWindow* parent,
+    virtual bool XmDoCreateTLW(wxWindow* parent,
                                wxWindowID id,
                                const wxString& title,
                                const wxPoint& pos,
@@ -87,7 +76,6 @@ private:
                                long style,
                                const wxString& name) = 0;
 
-    virtual void DoDestroy() { }
 
     wxString m_title;
 };