Instead of just deleting m_popupInterface, call Destroy() of its wxWindow-based popup...

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

diff --git a/include/wx/gtk/mdi.h b/include/wx/gtk/mdi.h
index 051987ad7e81d73e203192783ef879edf6f504b3..a10f42fb22294174eff429ad93aa6c67af2b2784 100644 (file)
--- a/include/wx/gtk/mdi.h
+++ b/include/wx/gtk/mdi.h
@@ -1,9 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/gtk/mdi.h
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/gtk/mdi.h

-// Purpose:
+// Purpose:     TDI-based MDI implementation for wxGTK

 // Author:      Robert Roebling
 // Author:      Robert Roebling

+// Modified by: 2008-10-31 Vadim Zeitlin: derive from the base classes

 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

+//              (c) 2008 Vadim Zeitlin

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -12,11 +14,16 @@
 
 #include "wx/frame.h"
 
 
 #include "wx/frame.h"
 

+class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame;
+class WXDLLIMPEXP_FWD_CORE wxMDIClientWindow;
+
+typedef struct _GtkNotebook GtkNotebook;
+

 //-----------------------------------------------------------------------------
 // wxMDIParentFrame
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // wxMDIParentFrame
 //-----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_CORE wxMDIParentFrame: public wxFrame
+class WXDLLIMPEXP_CORE wxMDIParentFrame : public wxMDIParentFrameBase

 {
 public:
     wxMDIParentFrame() { Init(); }
 {
 public:
     wxMDIParentFrame() { Init(); }


@@ -33,36 +40,35 @@ public:
         (void)Create(parent, id, title, pos, size, style, name);
     }
 
         (void)Create(parent, id, title, pos, size, style, name);
     }
 

-    virtual ~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 );
+    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);

 
 

-    wxMDIChildFrame *GetActiveChild() const;
+    // we don't store the active child in m_currentChild unlike the base class
+    // version so override this method to find it dynamically
+    virtual wxMDIChildFrame *GetActiveChild() const;

 
 

-    wxMDIClientWindow *GetClientWindow() const;
-    virtual wxMDIClientWindow *OnCreateClient();
+    // implement base class pure virtuals
+    // ----------------------------------

 
 

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

     virtual void ActivateNext();
     virtual void ActivatePrevious();
 
     virtual void ActivateNext();
     virtual void ActivatePrevious();
 

+    static bool IsTDI() { return true; }
+

     // implementation
 
     // implementation
 

-    wxMDIClientWindow  *m_clientWindow;

     bool                m_justInserted;
 
     bool                m_justInserted;
 

-    virtual void GtkOnSize();

     virtual void OnInternalIdle();
 
 protected:
     void Init();
     virtual void OnInternalIdle();
 
 protected:
     void Init();

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

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


@@ -74,102 +80,54 @@ private:
 // wxMDIChildFrame
 //-----------------------------------------------------------------------------
 
 // wxMDIChildFrame
 //-----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_CORE wxMDIChildFrame: public wxFrame
+class WXDLLIMPEXP_CORE wxMDIChildFrame : public wxTDIChildFrame

 {
 public:
 {
 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() { Init(); }
+    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)
+    {
+        Init();
+
+        Create(parent, id, title, pos, size, style, name);
+    }
+
+    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);

 
     virtual ~wxMDIChildFrame();
 
     virtual ~wxMDIChildFrame();

-    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 );

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

-    virtual void AddChild( wxWindowBase *child );
-

     virtual void Activate();
 
     virtual void Activate();
 

-#if wxUSE_STATUSBAR
-    // no status bars
-    virtual wxStatusBar* CreateStatusBar( int WXUNUSED(number) = 1,
-                                        long WXUNUSED(style) = 1,
-                                        wxWindowID WXUNUSED(id) = 1,
-                                        const wxString& WXUNUSED(name) = wxEmptyString)
-      { return (wxStatusBar*)NULL; }
-
-    virtual wxStatusBar *GetStatusBar() const { return (wxStatusBar*)NULL; }
-    virtual void SetStatusText( const wxString &WXUNUSED(text), int WXUNUSED(number)=0 ) {}
-    virtual void SetStatusWidths( int WXUNUSED(n), const int WXUNUSED(widths_field)[] ) {}
-#endif
-
-    // no size hints
-    virtual void DoSetSizeHints( int WXUNUSED(minW),
-                                 int WXUNUSED(minH),
-                                 int WXUNUSED(maxW) = wxDefaultCoord,
-                                 int WXUNUSED(maxH) = wxDefaultCoord,
-                                 int WXUNUSED(incW) = wxDefaultCoord,
-                                 int WXUNUSED(incH) = wxDefaultCoord) {}
-
-#if wxUSE_TOOLBAR
-    // 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; }
-#endif // wxUSE_TOOLBAR
-
-    // no icon
-    virtual void SetIcon(const wxIcon& icon)
-        { wxTopLevelWindowBase::SetIcon(icon); }
-    virtual void SetIcons(const wxIconBundle& icons )
-        { wxTopLevelWindowBase::SetIcons(icons); }
-
-    // no title
-    virtual void SetTitle( const wxString &title );
-
-    // no maximize etc
-    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 bool IsTopLevel() const { return false; }
-
-    virtual bool Destroy();
+    virtual void SetTitle(const wxString& title);
+
+    // implementation

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

-    // implementation
-

     wxMenuBar         *m_menuBar;
     GtkNotebookPage   *m_page;
     bool               m_justInserted;
 
     wxMenuBar         *m_menuBar;
     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:
 private:

+    void Init();
+
+    GtkNotebook *GTKGetNotebook() const;
+

     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxMDIChildFrame)
 };
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxMDIChildFrame)
 };


@@ -178,15 +136,18 @@ private:
 // wxMDIClientWindow
 //-----------------------------------------------------------------------------
 
 // wxMDIClientWindow
 //-----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_CORE wxMDIClientWindow: public wxWindow
+class WXDLLIMPEXP_CORE wxMDIClientWindow : public wxMDIClientWindowBase

 {
 public:
 {
 public:

-    wxMDIClientWindow();
-    wxMDIClientWindow( wxMDIParentFrame *parent, long style = 0 );
-    virtual ~wxMDIClientWindow();
-    virtual bool CreateClient( wxMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL );
+    wxMDIClientWindow() { }
+    ~wxMDIClientWindow();
+
+    virtual bool CreateClient(wxMDIParentFrame *parent,
+                              long style = wxVSCROLL | wxHSCROLL);

 
 private:
 
 private:

+    virtual void AddChildGTK(wxWindowGTK* child);
+

     DECLARE_DYNAMIC_CLASS(wxMDIClientWindow)
 };
 
     DECLARE_DYNAMIC_CLASS(wxMDIClientWindow)
 };