Add missing wxUSE_OLE checks to safearray.cpp.

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

diff --git a/include/wx/motif/toplevel.h b/include/wx/motif/toplevel.h
index 061d263dc46d848664d806a987b6f6a755793265..4144b83a3a48952156a0dcd1fccc889f031027f8 100644 (file)
--- a/include/wx/motif/toplevel.h
+++ b/include/wx/motif/toplevel.h
@@ -12,10 +12,6 @@
 #ifndef __MOTIFTOPLEVELH__
 #define __MOTIFTOPLEVELH__
 
 #ifndef __MOTIFTOPLEVELH__
 #define __MOTIFTOPLEVELH__
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "toplevel.h"
-#endif
-

 class WXDLLIMPEXP_CORE wxTopLevelWindowMotif : public wxTopLevelWindowBase
 {
 public:
 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 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;
     virtual bool SetShape( const wxRegion& region );
 
     WXWidget GetShellWidget() const;


@@ -70,6 +62,9 @@ protected:
     void PreDestroy();
 
     virtual void DoGetPosition(int* x, int* y) const;
     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:
     // really create the Motif widget for TLW
 
 private:
     // really create the Motif widget for TLW