more extra semicolons removed (patch 1303724)

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

diff --git a/include/wx/motif/toplevel.h b/include/wx/motif/toplevel.h
index 35bef8c4843ecf3070b8e2451d62adcfce9782a6..ae5e79cce943b1f36bcbd33feec4d899c8f06096 100644 (file)
--- a/include/wx/motif/toplevel.h
+++ b/include/wx/motif/toplevel.h
@@ -12,11 +12,7 @@
 #ifndef __MOTIFTOPLEVELH__
 #define __MOTIFTOPLEVELH__
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "toplevel.h"
-#endif
-
-class wxTopLevelWindowMotif : public wxTopLevelWindowBase
+class WXDLLIMPEXP_CORE wxTopLevelWindowMotif : public wxTopLevelWindowBase
 {
 public:
     wxTopLevelWindowMotif() { Init(); }
@@ -44,9 +40,9 @@ public:
     virtual bool ShowFullScreen( bool show, long style = wxFULLSCREEN_ALL );
     virtual bool IsFullScreen() const;
 
-    virtual void Maximize(bool maximize = TRUE);
+    virtual void Maximize(bool maximize = true);
     virtual void Restore();
-    virtual void Iconize(bool iconize = TRUE);
+    virtual void Iconize(bool iconize = true);
     virtual bool IsMaximized() const;
     virtual bool IsIconized() const;
 
@@ -56,7 +52,7 @@ public:
     virtual wxString GetTitle() const { return m_title; }
     virtual void SetTitle( const wxString& title ) { m_title = title; }
 
-    virtual void SetSizeHints( int minW, int minH,
+    virtual void DoSetSizeHints( int minW, int minH,
                                int maxW = -1, int maxH = -1,
                                int incW = -1, int incH = -1 );
 
@@ -70,17 +66,22 @@ protected:
     void PreDestroy();
 
     virtual void DoGetPosition(int* x, int* y) const;
+
 private:
-    // both these functions should be pure virtual
-    virtual bool DoCreate( wxWindow* parent, wxWindowID id,
-                           const wxString& title,
-                           const wxPoint& pos,
-                           const wxSize& size,
-                           long style,
-                           const wxString& name )
-    {
-        return FALSE;
-    }
+#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,
+                               wxWindowID id,
+                               const wxString& title,
+                               const wxPoint& pos,
+                               const wxSize& size,
+                               long style,
+                               const wxString& name) = 0;
 
     virtual void DoDestroy() { }