fixes for dialogs whose parent is wxMDI<whatever>Frame

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7204 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/gtk/mdi.h

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        mdi.h
+// Name:        gtk/mdi.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -45,12 +45,20 @@ extern const wxChar* wxStatusLineNameStr;
 class wxMDIParentFrame: public wxFrame
 {
 public:
-    wxMDIParentFrame();
+    wxMDIParentFrame() { Init(); }
     wxMDIParentFrame(wxWindow *parent,
-        wxWindowID id, const wxString& title,
+                     wxWindowID id,
-        const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
+                     const wxString& title,
+                     const wxPoint& pos = wxDefaultPosition,
+                     const wxSize& size = wxDefaultSize,
                      long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
-        const wxString& name = wxFrameNameStr );
+                     const wxString& name = wxFrameNameStr)
+    {
+        Init();
+
+        (void)Create(parent, id, title, pos, size, style, name);
+    }
+
     ~wxMDIParentFrame(void);
     bool Create( wxWindow *parent,
        wxWindowID id, const wxString& title,
@@ -70,9 +78,6 @@ public:
     virtual void ActivateNext();
     virtual void ActivatePrevious();
 
-    void OnActivate( wxActivateEvent& event );
-    void OnSysColourChanged( wxSysColourChangedEvent& event );
-    
     // implementation
 
     wxMDIClientWindow  *m_clientWindow;
@@ -81,11 +86,13 @@ public:
     virtual void GtkOnSize( int x, int y, int width, int height );
     virtual void OnInternalIdle();
 
+protected:
+    void Init();
+
 private:
     friend class wxMDIChildFrame;
 
     DECLARE_DYNAMIC_CLASS(wxMDIParentFrame)
-    DECLARE_EVENT_TABLE()    
 };
 
 //-----------------------------------------------------------------------------
@@ -143,7 +150,7 @@ public:
     void SetIcon( const wxIcon &icon ) { m_icon = icon; }
 
     // no title
-    void SetTitle( const wxString &title ) { m_title = title; }
+    void SetTitle( const wxString &title );
     wxString GetTitle() const { return m_title; }
 
     // no maximize etc

include/wx/gtk1/mdi.h

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        mdi.h
+// Name:        gtk/mdi.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -45,12 +45,20 @@ extern const wxChar* wxStatusLineNameStr;
 class wxMDIParentFrame: public wxFrame
 {
 public:
-    wxMDIParentFrame();
+    wxMDIParentFrame() { Init(); }
     wxMDIParentFrame(wxWindow *parent,
-        wxWindowID id, const wxString& title,
+                     wxWindowID id,
-        const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
+                     const wxString& title,
+                     const wxPoint& pos = wxDefaultPosition,
+                     const wxSize& size = wxDefaultSize,
                      long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
-        const wxString& name = wxFrameNameStr );
+                     const wxString& name = wxFrameNameStr)
+    {
+        Init();
+
+        (void)Create(parent, id, title, pos, size, style, name);
+    }
+
     ~wxMDIParentFrame(void);
     bool Create( wxWindow *parent,
        wxWindowID id, const wxString& title,
@@ -70,9 +78,6 @@ public:
     virtual void ActivateNext();
     virtual void ActivatePrevious();
 
-    void OnActivate( wxActivateEvent& event );
-    void OnSysColourChanged( wxSysColourChangedEvent& event );
-    
     // implementation
 
     wxMDIClientWindow  *m_clientWindow;
@@ -81,11 +86,13 @@ public:
     virtual void GtkOnSize( int x, int y, int width, int height );
     virtual void OnInternalIdle();
 
+protected:
+    void Init();
+
 private:
     friend class wxMDIChildFrame;
 
     DECLARE_DYNAMIC_CLASS(wxMDIParentFrame)
-    DECLARE_EVENT_TABLE()    
 };
 
 //-----------------------------------------------------------------------------
@@ -143,7 +150,7 @@ public:
     void SetIcon( const wxIcon &icon ) { m_icon = icon; }
 
     // no title
-    void SetTitle( const wxString &title ) { m_title = title; }
+    void SetTitle( const wxString &title );
     wxString GetTitle() const { return m_title; }
 
     // no maximize etc

samples/mdi/mdi.cpp

@@ -235,7 +235,7 @@ void MyFrame::OnNewWindow(wxCommandEvent& WXUNUSED(event) )
     wxMenu *option_menu = new wxMenu;
 
     option_menu->Append(MDI_REFRESH, "&Refresh picture");
-    option_menu->Append(MDI_CHANGE_TITLE, "Change &title...");
+    option_menu->Append(MDI_CHANGE_TITLE, "Change &title...\tCtrl-T");
 
     wxMenu *help_menu = new wxMenu;
     help_menu->Append(MDI_ABOUT, "&About");
@@ -429,7 +429,7 @@ void MyChild::OnChangeTitle(wxCommandEvent& WXUNUSED(event))
     wxString title = wxGetTextFromUser(_T("Enter the new title for MDI child"),
                                        _T("MDI sample question"),
                                        s_title,
-                                       this);
+                                       GetParent()->GetParent());
     if ( !title )
         return;
 

src/gtk/mdi.cpp

@@ -100,33 +100,23 @@ gtk_mdi_page_change_callback( GtkNotebook *WXUNUSED(widget),
 
 IMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame,wxFrame)
 
-BEGIN_EVENT_TABLE(wxMDIParentFrame, wxFrame)
+void wxMDIParentFrame::Init()
-END_EVENT_TABLE()
-
-wxMDIParentFrame::wxMDIParentFrame()
 {
     m_justInserted = FALSE;
     m_clientWindow = (wxMDIClientWindow *) NULL;
 }
 
-wxMDIParentFrame::wxMDIParentFrame( wxWindow *parent,
-      wxWindowID id, const wxString& title,
-      const wxPoint& pos, const wxSize& size,
-      long style, const wxString& name )
-{
-    m_justInserted = FALSE;
-    m_clientWindow = (wxMDIClientWindow *) NULL;
-    Create( parent, id, title, pos, size, style, name );
-}
-
 wxMDIParentFrame::~wxMDIParentFrame()
 {
 }
 
 bool wxMDIParentFrame::Create(wxWindow *parent,
-      wxWindowID id, const wxString& title,
+                              wxWindowID id,
-      const wxPoint& pos, const wxSize& size,
+                              const wxString& title,
-      long style, const wxString& name )
+                              const wxPoint& pos,
+                              const wxSize& size,
+                              long style,
+                              const wxString& name )
 {
     wxFrame::Create( parent, id, title, pos, size, style, name );
 
@@ -179,9 +169,12 @@ void wxMDIParentFrame::OnInternalIdle()
     wxNode *node = m_clientWindow->GetChildren().First();
     while (node)
     {
-        wxMDIChildFrame *child_frame = (wxMDIChildFrame *)node->Data();
+        wxObject *child = node->Data();
+        wxMDIChildFrame *child_frame = wxDynamicCast(child, wxMDIChildFrame);
+        if ( child_frame )
+        {
             wxMenuBar *menu_bar = child_frame->m_menuBar;
-        if (child_frame->m_menuBar)
+            if ( menu_bar )
             {
                 if (child_frame == active_child_frame)
                 {
@@ -204,6 +197,8 @@ void wxMDIParentFrame::OnInternalIdle()
                     }
                 }
             }
+        }
+
         node = node->Next();
     }
 
@@ -287,14 +282,6 @@ void wxMDIParentFrame::ActivatePrevious()
       gtk_notebook_prev_page( GTK_NOTEBOOK(m_clientWindow->m_widget) );
 }
 
-void wxMDIParentFrame::OnActivate( wxActivateEvent& WXUNUSED(event) )
-{
-}
-
-void wxMDIParentFrame::OnSysColourChanged( wxSysColourChangedEvent& WXUNUSED(event) )
-{
-}
-
 //-----------------------------------------------------------------------------
 // wxMDIChildFrame
 //-----------------------------------------------------------------------------

src/gtk1/mdi.cpp

@@ -100,33 +100,23 @@ gtk_mdi_page_change_callback( GtkNotebook *WXUNUSED(widget),
 
 IMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame,wxFrame)
 
-BEGIN_EVENT_TABLE(wxMDIParentFrame, wxFrame)
+void wxMDIParentFrame::Init()
-END_EVENT_TABLE()
-
-wxMDIParentFrame::wxMDIParentFrame()
 {
     m_justInserted = FALSE;
     m_clientWindow = (wxMDIClientWindow *) NULL;
 }
 
-wxMDIParentFrame::wxMDIParentFrame( wxWindow *parent,
-      wxWindowID id, const wxString& title,
-      const wxPoint& pos, const wxSize& size,
-      long style, const wxString& name )
-{
-    m_justInserted = FALSE;
-    m_clientWindow = (wxMDIClientWindow *) NULL;
-    Create( parent, id, title, pos, size, style, name );
-}
-
 wxMDIParentFrame::~wxMDIParentFrame()
 {
 }
 
 bool wxMDIParentFrame::Create(wxWindow *parent,
-      wxWindowID id, const wxString& title,
+                              wxWindowID id,
-      const wxPoint& pos, const wxSize& size,
+                              const wxString& title,
-      long style, const wxString& name )
+                              const wxPoint& pos,
+                              const wxSize& size,
+                              long style,
+                              const wxString& name )
 {
     wxFrame::Create( parent, id, title, pos, size, style, name );
 
@@ -179,9 +169,12 @@ void wxMDIParentFrame::OnInternalIdle()
     wxNode *node = m_clientWindow->GetChildren().First();
     while (node)
     {
-        wxMDIChildFrame *child_frame = (wxMDIChildFrame *)node->Data();
+        wxObject *child = node->Data();
+        wxMDIChildFrame *child_frame = wxDynamicCast(child, wxMDIChildFrame);
+        if ( child_frame )
+        {
             wxMenuBar *menu_bar = child_frame->m_menuBar;
-        if (child_frame->m_menuBar)
+            if ( menu_bar )
             {
                 if (child_frame == active_child_frame)
                 {
@@ -204,6 +197,8 @@ void wxMDIParentFrame::OnInternalIdle()
                     }
                 }
             }
+        }
+
         node = node->Next();
     }
 
@@ -287,14 +282,6 @@ void wxMDIParentFrame::ActivatePrevious()
       gtk_notebook_prev_page( GTK_NOTEBOOK(m_clientWindow->m_widget) );
 }
 
-void wxMDIParentFrame::OnActivate( wxActivateEvent& WXUNUSED(event) )
-{
-}
-
-void wxMDIParentFrame::OnSysColourChanged( wxSysColourChangedEvent& WXUNUSED(event) )
-{
-}
-
 //-----------------------------------------------------------------------------
 // wxMDIChildFrame
 //-----------------------------------------------------------------------------