Fixed bug #1022383: 'several ComboBoxes appear selected'

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

diff --git a/include/wx/gtk/mdi.h b/include/wx/gtk/mdi.h
index 08a518e3c2be38d572d13cbb1ebe8f80f971ca6c..b6e054b6482fff347586b8a3a98a625e78388f52 100644 (file)
--- a/include/wx/gtk/mdi.h
+++ b/include/wx/gtk/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
 


@@ -59,14 +59,15 @@ public:
         (void)Create(parent, id, title, pos, size, style, name);
     }
 
         (void)Create(parent, id, title, pos, size, style, name);
     }
 

-    ~wxMDIParentFrame(void);
+    ~wxMDIParentFrame();

     bool Create( wxWindow *parent,
     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 );

 
 

-    void GetClientSize(int *width, int *height) const;

     wxMDIChildFrame *GetActiveChild() const;
 
     wxMDIClientWindow *GetClientWindow() const;
     wxMDIChildFrame *GetActiveChild() const;
 
     wxMDIClientWindow *GetClientWindow() const;


@@ -89,6 +90,8 @@ public:
 protected:
     void Init();
 
 protected:
     void Init();
 

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

 private:
     friend class wxMDIChildFrame;
 
 private:
     friend class wxMDIChildFrame;
 


@@ -104,19 +107,25 @@ class wxMDIChildFrame: public wxFrame
 public:
     wxMDIChildFrame();
     wxMDIChildFrame( wxMDIParentFrame *parent,
 public:
     wxMDIChildFrame();
     wxMDIChildFrame( wxMDIParentFrame *parent,

-      wxWindowID id, const wxString& title,
-      const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-      long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxFrameNameStr );
-    ~wxMDIChildFrame();
+                     wxWindowID id,
+                     const wxString& title,
+                     const wxPoint& pos = wxDefaultPosition,
+                     const wxSize& size = wxDefaultSize,
+                     long style = wxDEFAULT_FRAME_STYLE,
+                     const wxString& name = wxFrameNameStr );
+
+    virtual ~wxMDIChildFrame();

     bool Create( wxMDIParentFrame *parent,
     bool Create( wxMDIParentFrame *parent,

-      wxWindowID id, const wxString& title,
-      const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-      long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxFrameNameStr );
+                 wxWindowID id,
+                 const wxString& title,
+                 const wxPoint& pos = wxDefaultPosition,
+                 const wxSize& size = wxDefaultSize,
+                 long style = wxDEFAULT_FRAME_STYLE,
+                 const wxString& name = wxFrameNameStr );

 
     virtual void SetMenuBar( wxMenuBar *menu_bar );
     virtual wxMenuBar *GetMenuBar() const;
 
 
     virtual void SetMenuBar( wxMenuBar *menu_bar );
     virtual wxMenuBar *GetMenuBar() const;
 

-    virtual void GetClientSize( int *width, int *height ) const;

     virtual void AddChild( wxWindowBase *child );
 
     virtual void Activate();
     virtual void AddChild( wxWindowBase *child );
 
     virtual void Activate();


@@ -135,19 +144,25 @@ public:
 #endif
 
     // no size hints
 #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 DoSetSizeHints( 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
 
 #if wxUSE_TOOLBAR
     // no toolbar bars

-    virtual wxToolBar* CreateToolBar( long WXUNUSED(style), wxWindowID WXUNUSED(id),
-        const wxString& WXUNUSED(name) ) { 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
 
     // no icon
     virtual wxToolBar *GetToolBar() const { return (wxToolBar*)NULL; }
 #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 );
 
     // no title
     void SetTitle( const wxString &title );


@@ -168,6 +183,14 @@ public:
     GtkNotebookPage   *m_page;
     bool               m_justInserted;
 
     GtkNotebookPage   *m_page;
     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:
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxMDIChildFrame)
 private:
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxMDIChildFrame)