On wxGTK2 the label woudl not be realigned if SetLabel was called with

[wxWidgets.git] / src / gtk1 / mdi.cpp

diff --git a/src/gtk1/mdi.cpp b/src/gtk1/mdi.cpp
index 99bcb7ede4992aa0ac66b3e30fea4a7c49a5b9fc..d2de112f36def984642e80cb53b59a784ba77403 100644 (file)
--- a/src/gtk1/mdi.cpp
+++ b/src/gtk1/mdi.cpp
@@ -7,17 +7,21 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

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

 #pragma implementation "mdi.h"
 #endif
 
 #pragma implementation "mdi.h"
 #endif
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+

 #include "wx/mdi.h"
 
 #include "wx/mdi.h"
 

-#if wxUSE_MDI_ARCHITECTURE
+#if wxUSE_MDI

 
 #include "wx/dialog.h"
 #include "wx/menu.h"
 #include "wx/intl.h"
 
 #include "wx/dialog.h"
 #include "wx/menu.h"
 #include "wx/intl.h"

+#include "wx/gtk/private.h"

 
 #include <glib.h>
 #include <gdk/gdk.h>
 
 #include <glib.h>
 #include <gdk/gdk.h>


@@ -61,7 +65,7 @@ gtk_mdi_page_change_callback( GtkNotebook *WXUNUSED(widget),
     wxMDIChildFrame *child = parent->GetActiveChild();
     if (child)
     {
     wxMDIChildFrame *child = parent->GetActiveChild();
     if (child)
     {

-        wxActivateEvent event1( wxEVT_ACTIVATE, FALSE, child->GetId() );
+        wxActivateEvent event1( wxEVT_ACTIVATE, false, child->GetId() );

         event1.SetEventObject( child);
         child->GetEventHandler()->ProcessEvent( event1 );
     }
         event1.SetEventObject( child);
         child->GetEventHandler()->ProcessEvent( event1 );
     }


@@ -74,22 +78,25 @@ gtk_mdi_page_change_callback( GtkNotebook *WXUNUSED(widget),
 
     child = (wxMDIChildFrame*) NULL;
 
 
     child = (wxMDIChildFrame*) NULL;
 

-    wxNode *node = client_window->GetChildren().First();
+    wxWindowList::compatibility_iterator node = client_window->GetChildren().GetFirst();

     while (node)
     {
     while (node)
     {

-        wxMDIChildFrame *child_frame = (wxMDIChildFrame *)node->Data();
+        wxMDIChildFrame *child_frame = wxDynamicCast( node->GetData(), wxMDIChildFrame );
+
+        wxASSERT_MSG( child_frame, _T("child is not a wxMDIChildFrame") );
+

         if (child_frame->m_page == page)
         {
             child = child_frame;
             break;
         }
         if (child_frame->m_page == page)
         {
             child = child_frame;
             break;
         }

-        node = node->Next();
+        node = node->GetNext();

     }
 
     if (!child)
          return;
 
     }
 
     if (!child)
          return;
 

-    wxActivateEvent event2( wxEVT_ACTIVATE, TRUE, child->GetId() );
+    wxActivateEvent event2( wxEVT_ACTIVATE, true, child->GetId() );

     event2.SetEventObject( child);
     child->GetEventHandler()->ProcessEvent( event2 );
 }
     event2.SetEventObject( child);
     child->GetEventHandler()->ProcessEvent( event2 );
 }


@@ -102,7 +109,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame,wxFrame)
 
 void wxMDIParentFrame::Init()
 {
 
 void wxMDIParentFrame::Init()
 {

-    m_justInserted = FALSE;
+    m_justInserted = false;

     m_clientWindow = (wxMDIClientWindow *) NULL;
 }
 
     m_clientWindow = (wxMDIClientWindow *) NULL;
 }
 


@@ -122,7 +129,7 @@ bool wxMDIParentFrame::Create(wxWindow *parent,
 
     OnCreateClient();
 
 
     OnCreateClient();
 

-    return TRUE;
+    return true;

 }
 
 void wxMDIParentFrame::GtkOnSize( int x, int y, int width, int height )
 }
 
 void wxMDIParentFrame::GtkOnSize( int x, int y, int width, int height )


@@ -157,20 +164,20 @@ void wxMDIParentFrame::OnInternalIdle()
         GtkNotebook *notebook = GTK_NOTEBOOK(m_clientWindow->m_widget);
         gtk_notebook_set_page( notebook, g_list_length( notebook->children ) - 1 );
 
         GtkNotebook *notebook = GTK_NOTEBOOK(m_clientWindow->m_widget);
         gtk_notebook_set_page( notebook, g_list_length( notebook->children ) - 1 );
 

-        m_justInserted = FALSE;
+        m_justInserted = false;

         return;
     }
 
     wxFrame::OnInternalIdle();
 
     wxMDIChildFrame *active_child_frame = GetActiveChild();
         return;
     }
 
     wxFrame::OnInternalIdle();
 
     wxMDIChildFrame *active_child_frame = GetActiveChild();

-    bool visible_child_menu = FALSE;
+    bool visible_child_menu = false;

 
 

-    wxNode *node = m_clientWindow->GetChildren().First();
+    wxWindowList::compatibility_iterator node = m_clientWindow->GetChildren().GetFirst();

     while (node)
     {
     while (node)
     {

-        wxObject *child = node->Data();
-        wxMDIChildFrame *child_frame = wxDynamicCast(child, wxMDIChildFrame);
+        wxMDIChildFrame *child_frame = wxDynamicCast( node->GetData(), wxMDIChildFrame );
+

         if ( child_frame )
         {
             wxMenuBar *menu_bar = child_frame->m_menuBar;
         if ( child_frame )
         {
             wxMenuBar *menu_bar = child_frame->m_menuBar;


@@ -178,7 +185,7 @@ void wxMDIParentFrame::OnInternalIdle()
             {
                 if (child_frame == active_child_frame)
                 {
             {
                 if (child_frame == active_child_frame)
                 {

-                    if (menu_bar->Show(TRUE))
+                    if (menu_bar->Show(true))

                     {
                         menu_bar->m_width = m_width;
                         menu_bar->m_height = wxMENU_HEIGHT;
                     {
                         menu_bar->m_width = m_width;
                         menu_bar->m_height = wxMENU_HEIGHT;


@@ -187,11 +194,11 @@ void wxMDIParentFrame::OnInternalIdle()
                                             0, 0, m_width, wxMENU_HEIGHT );
                         menu_bar->SetInvokingWindow( child_frame );
                     }
                                             0, 0, m_width, wxMENU_HEIGHT );
                         menu_bar->SetInvokingWindow( child_frame );
                     }

-                    visible_child_menu = TRUE;
+                    visible_child_menu = true;

                 }
                 else
                 {
                 }
                 else
                 {

-                    if (menu_bar->Show(FALSE))
+                    if (menu_bar->Show(false))

                     {
                         menu_bar->UnsetInvokingWindow( child_frame );
                     }
                     {
                         menu_bar->UnsetInvokingWindow( child_frame );
                     }


@@ -199,7 +206,7 @@ void wxMDIParentFrame::OnInternalIdle()
             }
         }
 
             }
         }
 

-        node = node->Next();
+        node = node->GetNext();

     }
 
     /* show/hide parent menu bar as required */
     }
 
     /* show/hide parent menu bar as required */


@@ -208,12 +215,12 @@ void wxMDIParentFrame::OnInternalIdle()
     {
         if (visible_child_menu)
         {
     {
         if (visible_child_menu)
         {

-            m_frameMenuBar->Show( FALSE );
+            m_frameMenuBar->Show( false );

             m_frameMenuBar->UnsetInvokingWindow( this );
         }
         else
         {
             m_frameMenuBar->UnsetInvokingWindow( this );
         }
         else
         {

-            m_frameMenuBar->Show( TRUE );
+            m_frameMenuBar->Show( true );

             m_frameMenuBar->SetInvokingWindow( this );
 
             m_frameMenuBar->m_width = m_width;
             m_frameMenuBar->SetInvokingWindow( this );
 
             m_frameMenuBar->m_width = m_width;


@@ -237,23 +244,22 @@ wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const
     GtkNotebook *notebook = GTK_NOTEBOOK(m_clientWindow->m_widget);
     if (!notebook) return (wxMDIChildFrame*) NULL;
 
     GtkNotebook *notebook = GTK_NOTEBOOK(m_clientWindow->m_widget);
     if (!notebook) return (wxMDIChildFrame*) NULL;
 

-#if (GTK_MINOR_VERSION > 0)

     gint i = gtk_notebook_get_current_page( notebook );
     gint i = gtk_notebook_get_current_page( notebook );

-#else
-    gint i = gtk_notebook_current_page( notebook );
-#endif

     if (i < 0) return (wxMDIChildFrame*) NULL;
 
     GtkNotebookPage* page = (GtkNotebookPage*) (g_list_nth(notebook->children,i)->data);
     if (!page) return (wxMDIChildFrame*) NULL;
 
     if (i < 0) return (wxMDIChildFrame*) NULL;
 
     GtkNotebookPage* page = (GtkNotebookPage*) (g_list_nth(notebook->children,i)->data);
     if (!page) return (wxMDIChildFrame*) NULL;
 

-    wxNode *node = m_clientWindow->GetChildren().First();
+    wxWindowList::compatibility_iterator node = m_clientWindow->GetChildren().GetFirst();

     while (node)
     {
     while (node)
     {

-        wxMDIChildFrame *child_frame = (wxMDIChildFrame *)node->Data();
+        wxMDIChildFrame *child_frame = wxDynamicCast( node->GetData(), wxMDIChildFrame );
+
+        wxASSERT_MSG( child_frame, _T("child is not a wxMDIChildFrame") );
+

         if (child_frame->m_page == page)
             return child_frame;
         if (child_frame->m_page == page)
             return child_frame;

-        node = node->Next();
+        node = node->GetNext();

     }
 
     return (wxMDIChildFrame*) NULL;
     }
 
     return (wxMDIChildFrame*) NULL;


@@ -325,6 +331,16 @@ bool wxMDIChildFrame::Create( wxMDIParentFrame *parent,
     return wxWindow::Create( parent->GetClientWindow(), id, wxDefaultPosition, size, style, name );
 }
 
     return wxWindow::Create( parent->GetClientWindow(), id, wxDefaultPosition, size, style, name );
 }
 

+void wxMDIChildFrame::DoSetSize( int x, int y, int width, int height, int sizeFlags )
+{
+    wxWindow::DoSetSize( x, y, width, height, sizeFlags );
+}
+
+void wxMDIChildFrame::DoSetClientSize(int width, int height)
+{
+    wxWindow::DoSetClientSize( width, height );
+}
+

 void wxMDIChildFrame::DoGetClientSize( int *width, int *height ) const
 {
     wxWindow::DoGetClientSize( width, height );
 void wxMDIChildFrame::DoGetClientSize( int *width, int *height ) const
 {
     wxWindow::DoGetClientSize( width, height );


@@ -361,17 +377,10 @@ wxMenuBar *wxMDIChildFrame::GetMenuBar() const
 
 void wxMDIChildFrame::Activate()
 {
 
 void wxMDIChildFrame::Activate()
 {

-#if defined(__WXGTK20__) || (GTK_MINOR_VERSION > 0)

     wxMDIParentFrame* parent = (wxMDIParentFrame*) GetParent();
     GtkNotebook* notebook = GTK_NOTEBOOK(parent->m_widget);
     gint pageno = gtk_notebook_page_num( notebook, m_widget );
     gtk_notebook_set_page( notebook, pageno );
     wxMDIParentFrame* parent = (wxMDIParentFrame*) GetParent();
     GtkNotebook* notebook = GTK_NOTEBOOK(parent->m_widget);
     gint pageno = gtk_notebook_page_num( notebook, m_widget );
     gtk_notebook_set_page( notebook, pageno );

-#else // GTK+ 1.0
-    // the only way I can see to do this under gtk+ 1.0.X would
-    // be to keep track of page numbers, start at first and
-    // do "next" enough times to get to this page number - messy
-    // - J. Russell Smyth
-#endif

 }
 
 void wxMDIChildFrame::OnActivate( wxActivateEvent& WXUNUSED(event) )
 }
 
 void wxMDIChildFrame::OnActivate( wxActivateEvent& WXUNUSED(event) )


@@ -400,7 +409,7 @@ void wxMDIChildFrame::SetTitle( const wxString &title )
 
     wxMDIParentFrame* parent = (wxMDIParentFrame*) GetParent();
     GtkNotebook* notebook = GTK_NOTEBOOK(parent->m_widget);
 
     wxMDIParentFrame* parent = (wxMDIParentFrame*) GetParent();
     GtkNotebook* notebook = GTK_NOTEBOOK(parent->m_widget);

-    gtk_notebook_set_tab_label_text(notebook, m_widget, title.mbc_str());
+    gtk_notebook_set_tab_label_text(notebook, m_widget, wxGTK_CONV( title ) );

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -445,7 +454,7 @@ static void wxInsertChildInMDI( wxMDIClientWindow* parent, wxMDIChildFrame* chil
     child->m_page = (GtkNotebookPage*) (g_list_last(notebook->children)->data);
 
     wxMDIParentFrame *parent_frame = (wxMDIParentFrame*) parent->GetParent();
     child->m_page = (GtkNotebookPage*) (g_list_last(notebook->children)->data);
 
     wxMDIParentFrame *parent_frame = (wxMDIParentFrame*) parent->GetParent();

-    parent_frame->m_justInserted = TRUE;
+    parent_frame->m_justInserted = true;

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -469,7 +478,7 @@ wxMDIClientWindow::~wxMDIClientWindow()
 
 bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style )
 {
 
 bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style )
 {

-    m_needParent = TRUE;
+    m_needParent = true;

 
     m_insertCallback = (wxInsertChildFunction)wxInsertChildInMDI;
 
 
     m_insertCallback = (wxInsertChildFunction)wxInsertChildInMDI;
 


@@ -477,7 +486,7 @@ bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style )
         !CreateBase( parent, -1, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, wxT("wxMDIClientWindow") ))
     {
         wxFAIL_MSG( wxT("wxMDIClientWindow creation failed") );
         !CreateBase( parent, -1, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, wxT("wxMDIClientWindow") ))
     {
         wxFAIL_MSG( wxT("wxMDIClientWindow creation failed") );

-        return FALSE;
+        return false;

     }
 
     m_widget = gtk_notebook_new();
     }
 
     m_widget = gtk_notebook_new();


@@ -491,9 +500,9 @@ bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style )
 
     PostCreation();
 
 
     PostCreation();
 

-    Show( TRUE );
+    Show( true );

 
 

-    return TRUE;
+    return true;

 }
 
 #endif
 }
 
 #endif