use LVS_EX_LABELTIP by default

[wxWidgets.git] / include / wx / gtk1 / mdi.h

diff --git a/include/wx/gtk1/mdi.h b/include/wx/gtk1/mdi.h
index 3dd4ca65303d3f93f039142f354d7465a4a3c104..991610644efecbdd524f3d9cac879381935c80cc 100644 (file)
--- a/include/wx/gtk1/mdi.h
+++ b/include/wx/gtk1/mdi.h
@@ -11,7 +11,7 @@
 #ifndef __MDIH__
 #define __MDIH__
 
 #ifndef __MDIH__
 #define __MDIH__
 

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

 #pragma interface
 #endif
 
 #pragma interface
 #endif
 


@@ -74,7 +74,7 @@ public:
     virtual wxMDIClientWindow *OnCreateClient();
 
     virtual void Cascade() {}
     virtual wxMDIClientWindow *OnCreateClient();
 
     virtual void Cascade() {}

-    virtual void Tile() {}
+    virtual void Tile(wxOrientation WXUNUSED(orient) = wxHORIZONTAL) {}

     virtual void ArrangeIcons() {}
     virtual void ActivateNext();
     virtual void ActivatePrevious();
     virtual void ArrangeIcons() {}
     virtual void ActivateNext();
     virtual void ActivatePrevious();


@@ -144,7 +144,7 @@ public:
 #endif
 
     // no size hints
 #endif
 
     // no size hints

-    virtual void SetSizeHints( int WXUNUSED(minW),
+    virtual void DoSetSizeHints( int WXUNUSED(minW),

                                int WXUNUSED(minH),
                                int WXUNUSED(maxW) = -1,
                                int WXUNUSED(maxH) = -1,
                                int WXUNUSED(minH),
                                int WXUNUSED(maxW) = -1,
                                int WXUNUSED(maxH) = -1,


@@ -152,26 +152,32 @@ public:
                                int WXUNUSED(incH) = -1) {}
 
 #if wxUSE_TOOLBAR
                                int WXUNUSED(incH) = -1) {}
 
 #if wxUSE_TOOLBAR

-    // no toolbar bars
+    // no toolbar

     virtual wxToolBar* CreateToolBar( long WXUNUSED(style),
                                        wxWindowID WXUNUSED(id),
                                        const wxString& WXUNUSED(name) )
         { return (wxToolBar*)NULL; }
     virtual wxToolBar *GetToolBar() const { return (wxToolBar*)NULL; }
     virtual wxToolBar* CreateToolBar( long WXUNUSED(style),
                                        wxWindowID WXUNUSED(id),
                                        const wxString& WXUNUSED(name) )
         { return (wxToolBar*)NULL; }
     virtual wxToolBar *GetToolBar() const { return (wxToolBar*)NULL; }

-#endif
+#endif // wxUSE_TOOLBAR

 
     // no icon
 
     // no icon

-    void SetIcon( const wxIcon &icon ) { m_icon = icon; }
+    virtual void SetIcon(const wxIcon& icon)
+        { wxTopLevelWindowBase::SetIcon(icon); }
+    virtual void SetIcons(const wxIconBundle& icons )
+        { wxTopLevelWindowBase::SetIcons(icons); }

 
     // no title
     void SetTitle( const wxString &title );
     wxString GetTitle() const { return m_title; }
 
     // no maximize etc
 
     // no title
     void SetTitle( const wxString &title );
     wxString GetTitle() const { return m_title; }
 
     // no maximize etc

-    virtual void Maximize( bool WXUNUSED(maximize) ) {}
+    virtual void Maximize( bool WXUNUSED(maximize) = true ) { }
+    virtual bool IsMaximized() const { return true; }
+    virtual void Iconize(bool WXUNUSED(iconize) = true) { }
+    virtual bool IsIconized() const { return false; }

     virtual void Restore() {}
 
     virtual void Restore() {}
 

-    virtual bool IsTopLevel() const { return FALSE; }
+    virtual bool IsTopLevel() const { return false; }

 
     void OnActivate( wxActivateEvent& event );
     void OnMenuHighlight( wxMenuEvent& event );
 
     void OnActivate( wxActivateEvent& event );
     void OnMenuHighlight( wxMenuEvent& event );


@@ -183,6 +189,11 @@ public:
     bool               m_justInserted;
 
 protected:
     bool               m_justInserted;
 
 protected:

+    // override wxFrame methods to not do anything
+    virtual void DoSetSize(int x, int y,
+                           int width, int height,
+                           int sizeFlags = wxSIZE_AUTO);
+    virtual void DoSetClientSize(int width, int height);

     virtual void DoGetClientSize( int *width, int *height ) const;
 
 private:
     virtual void DoGetClientSize( int *width, int *height ) const;
 
 private: