Correct compilation conditions for wxURL::SetProxy.

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

diff --git a/include/wx/motif/toplevel.h b/include/wx/motif/toplevel.h
index 6d16717756ada716d22dd698a32a2e2a3824e698..f6f4bf01bca715cfbd6cf2d5ec14157a6fc9c5bd 100644 (file)
--- a/include/wx/motif/toplevel.h
+++ b/include/wx/motif/toplevel.h
@@ -12,7 +12,7 @@
 #ifndef __MOTIFTOPLEVELH__
 #define __MOTIFTOPLEVELH__
 
 #ifndef __MOTIFTOPLEVELH__
 #define __MOTIFTOPLEVELH__
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "toplevel.h"
 #endif
 
     #pragma interface "toplevel.h"
 #endif
 


@@ -44,9 +44,9 @@ public:
     virtual bool ShowFullScreen( bool show, long style = wxFULLSCREEN_ALL );
     virtual bool IsFullScreen() const;
 
     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 Restore();

-    virtual void Iconize(bool iconize = TRUE);
+    virtual void Iconize(bool iconize = true);

     virtual bool IsMaximized() const;
     virtual bool IsIconized() const;
 
     virtual bool IsMaximized() const;
     virtual bool IsIconized() const;
 


@@ -56,11 +56,20 @@ 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;
 protected:
     // common part of all constructors
     void Init();
     WXWidget GetShellWidget() const;
 protected:
     // common part of all constructors
     void Init();

+    // common part of wxDialog/wxFrame destructors
+    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,
 private:
     // both these functions should be pure virtual
     virtual bool DoCreate( wxWindow* parent, wxWindowID id,


@@ -70,7 +79,7 @@ private:
                            long style,
                            const wxString& name )
     {
                            long style,
                            const wxString& name )
     {

-        return FALSE;
+        return false;

     }
 
     virtual void DoDestroy() { }
     }
 
     virtual void DoDestroy() { }