Corrected assertion

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

diff --git a/include/wx/gtk1/mdi.h b/include/wx/gtk1/mdi.h
index 2e4d00c55eada0a5a18ef68da666fda43f2f9eb5..5dd2ae17626a0c7853394daa37f0aeb384b2274e 100644 (file)
--- a/include/wx/gtk1/mdi.h
+++ b/include/wx/gtk1/mdi.h
@@ -59,12 +59,14 @@ public:
         (void)Create(parent, id, title, pos, size, style, name);
     }
 
-    ~wxMDIParentFrame(void);
+    ~wxMDIParentFrame();
     bool Create( wxWindow *parent,
-       wxWindowID id, const wxString& title,
-       const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-       long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
-       const wxString& name = wxFrameNameStr );
+                 wxWindowID id,
+                 const wxString& title,
+                 const wxPoint& pos = wxDefaultPosition,
+                 const wxSize& size = wxDefaultSize,
+                 long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
+                 const wxString& name = wxFrameNameStr );
 
     wxMDIChildFrame *GetActiveChild() const;
 
@@ -142,9 +144,12 @@ public:
 #endif
 
     // no size hints
-    virtual void SetSizeHints( int WXUNUSED(minW), int WXUNUSED(minH),
-                               int WXUNUSED(maxW), int WXUNUSED(maxH),
-                               int WXUNUSED(incW), int WXUNUSED(incH) ) {}
+    virtual void SetSizeHints( int WXUNUSED(minW),
+                               int WXUNUSED(minH),
+                               int WXUNUSED(maxW) = -1,
+                               int WXUNUSED(maxH) = -1,
+                               int WXUNUSED(incW) = -1,
+                               int WXUNUSED(incH) = -1) {}
 
 #if wxUSE_TOOLBAR
     // no toolbar bars
@@ -156,7 +161,8 @@ public:
 #endif
 
     // no icon
-    void SetIcon( const wxIcon &icon ) { m_icon = icon; }
+    void SetIcon( const wxIcon &icon ) { m_icons = wxIconBundle( icon ); }
+    void SetIcons( const wxIconBundle &icons ) { m_icons = icons; }
 
     // no title
     void SetTitle( const wxString &title );