one more minor wxLogWindow fix (I try to get it really right...)

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

diff --git a/src/gtk/mdi.cpp b/src/gtk/mdi.cpp
index 1d8c9ffb6223ff603603272ded13c2fc31729e9e..4f71cc31cf6191695b039a2eadb153b0a5f3c91e 100644 (file)
--- a/src/gtk/mdi.cpp
+++ b/src/gtk/mdi.cpp
@@ -5,7 +5,7 @@
 // Created:     01/02/97
 // Id:
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
 // Created:     01/02/97
 // Id:
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -16,6 +16,7 @@
 #include "wx/dialog.h"
 #include "wx/menu.h"
 #include "wx/gtk/win_gtk.h"
 #include "wx/dialog.h"
 #include "wx/menu.h"
 #include "wx/gtk/win_gtk.h"

+#include <wx/intl.h>

 
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 


@@ -26,7 +27,7 @@ extern wxList wxPendingDelete;
 //-----------------------------------------------------------------------------
 
 static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxWindow *win )
 //-----------------------------------------------------------------------------
 
 static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxWindow *win )

-{ 
+{

   if ((win->m_x == alloc->x) &&
       (win->m_y == alloc->y) &&
       (win->m_width == alloc->width) &&
   if ((win->m_x == alloc->x) &&
       (win->m_y == alloc->y) &&
       (win->m_width == alloc->width) &&


@@ -34,7 +35,7 @@ static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation*
   {
     return;
   };
   {
     return;
   };

-  
+

   win->SetSize( alloc->x, alloc->y, alloc->width, alloc->height );
 };
 
   win->SetSize( alloc->x, alloc->y, alloc->width, alloc->height );
 };
 


@@ -94,22 +95,22 @@ bool wxMDIParentFrame::Create( wxWindow *parent,
       long style, const wxString& name )
 {
   wxFrame::Create( parent, id, title, pos, size, style, name );
       long style, const wxString& name )
 {
   wxFrame::Create( parent, id, title, pos, size, style, name );

-  
+

   OnCreateClient();
   OnCreateClient();

-  
+

   return TRUE;
 };
 
 void wxMDIParentFrame::GtkOnSize( int x, int y, int width, int height )
 {
   wxFrame::GtkOnSize( x, y, width, height );
   return TRUE;
 };
 
 void wxMDIParentFrame::GtkOnSize( int x, int y, int width, int height )
 {
   wxFrame::GtkOnSize( x, y, width, height );

-  
+

   if (m_mdiMenuBar)
   {
     int x = 0;
     int y = 0;
     GetClientSize( &x, &y );
   if (m_mdiMenuBar)
   {
     int x = 0;
     int y = 0;
     GetClientSize( &x, &y );

-    m_mdiMenuBar->SetSize( 1, 1, x-2, 26 ); 
+    m_mdiMenuBar->SetSize( 1, 1, x-2, 26 );

   }
 };
 
   }
 };
 


@@ -122,7 +123,7 @@ void wxMDIParentFrame::SetMDIMenuBar( wxMenuBar *menu_bar )
     int x = 0;
     int y = 0;
     GetClientSize( &x, &y );
     int x = 0;
     int y = 0;
     GetClientSize( &x, &y );

-    m_mdiMenuBar->SetSize( 1, 1, x-2, 26 ); 
+    m_mdiMenuBar->SetSize( 1, 1, x-2, 26 );

     m_mdiMenuBar->Show( TRUE );
   }
 };
     m_mdiMenuBar->Show( TRUE );
   }
 };


@@ -243,11 +244,11 @@ static void SetInvokingWindow( wxMenu *menu, wxWindow *win )
 void wxMDIChildFrame::SetMenuBar( wxMenuBar *menu_bar )
 {
   m_menuBar = menu_bar;
 void wxMDIChildFrame::SetMenuBar( wxMenuBar *menu_bar )
 {
   m_menuBar = menu_bar;

-  
+

   if (m_menuBar)
   {
     wxMDIParentFrame *mdi_frame = (wxMDIParentFrame*)m_parent->m_parent;
   if (m_menuBar)
   {
     wxMDIParentFrame *mdi_frame = (wxMDIParentFrame*)m_parent->m_parent;

-    
+

     if (m_menuBar->m_parent != this)
     {
       wxNode *node = m_menuBar->m_menus.First();
     if (m_menuBar->m_parent != this)
     {
       wxNode *node = m_menuBar->m_menus.First();


@@ -257,7 +258,7 @@ void wxMDIChildFrame::SetMenuBar( wxMenuBar *menu_bar )
         SetInvokingWindow( menu, this );
         node = node->Next();
       };
         SetInvokingWindow( menu, this );
         node = node->Next();
       };

-      
+

       m_menuBar->m_parent = mdi_frame;
     }
     mdi_frame->SetMDIMenuBar( m_menuBar );
       m_menuBar->m_parent = mdi_frame;
     }
     mdi_frame->SetMDIMenuBar( m_menuBar );


@@ -302,20 +303,20 @@ wxMDIClientWindow::~wxMDIClientWindow(void)
 bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style )
 {
   m_needParent = TRUE;
 bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style )
 {
   m_needParent = TRUE;

-  
+

   PreCreation( parent, -1, wxPoint(10,10), wxSize(100,100), style, "wxMDIClientWindow" );
 
   m_widget = gtk_notebook_new();
   PreCreation( parent, -1, wxPoint(10,10), wxSize(100,100), style, "wxMDIClientWindow" );
 
   m_widget = gtk_notebook_new();

-  
+

   gtk_signal_connect( GTK_OBJECT(m_widget), "switch_page",
                       GTK_SIGNAL_FUNC(gtk_page_change_callback), (gpointer)this );
   gtk_signal_connect( GTK_OBJECT(m_widget), "switch_page",
                       GTK_SIGNAL_FUNC(gtk_page_change_callback), (gpointer)this );

-                 
+

   gtk_notebook_set_scrollable( GTK_NOTEBOOK(m_widget), 1 );
   gtk_notebook_set_scrollable( GTK_NOTEBOOK(m_widget), 1 );

-  
+

   PostCreation();
   PostCreation();

-  
+

   Show( TRUE );
   Show( TRUE );

-  
+

   return TRUE;
 };
 
   return TRUE;
 };
 


@@ -326,25 +327,25 @@ void wxMDIClientWindow::AddChild( wxWindow *child )
      wxFAIL_MSG("wxNotebook::AddChild: Child has to be wxMDIChildFrame");
      return;
   };
      wxFAIL_MSG("wxNotebook::AddChild: Child has to be wxMDIChildFrame");
      return;
   };

-  
+

   m_children.Append( child );
   m_children.Append( child );

-  
+

   wxString s;
   wxMDIChildFrame* mdi_child = (wxMDIChildFrame*) child;
   s = mdi_child->m_title;
   wxString s;
   wxMDIChildFrame* mdi_child = (wxMDIChildFrame*) child;
   s = mdi_child->m_title;

-  if (s.IsNull()) s = "MDI child";
-  
+  if (s.IsNull()) s = _("MDI child");
+

   GtkWidget *label_widget;
   label_widget = gtk_label_new( s );
   gtk_misc_set_alignment( GTK_MISC(label_widget), 0.0, 0.5 );
   GtkWidget *label_widget;
   label_widget = gtk_label_new( s );
   gtk_misc_set_alignment( GTK_MISC(label_widget), 0.0, 0.5 );

-  
+

   gtk_signal_connect( GTK_OBJECT(child->m_widget), "size_allocate",
     GTK_SIGNAL_FUNC(gtk_page_size_callback), (gpointer)child );
     
   gtk_notebook_append_page( GTK_NOTEBOOK(m_widget), child->m_widget, label_widget );
   gtk_signal_connect( GTK_OBJECT(child->m_widget), "size_allocate",
     GTK_SIGNAL_FUNC(gtk_page_size_callback), (gpointer)child );
     
   gtk_notebook_append_page( GTK_NOTEBOOK(m_widget), child->m_widget, label_widget );

-  
+

   mdi_child->m_page = (GtkNotebookPage*) (g_list_last(GTK_NOTEBOOK(m_widget)->children)->data);
   mdi_child->m_page = (GtkNotebookPage*) (g_list_last(GTK_NOTEBOOK(m_widget)->children)->data);

-    
+

   gtk_notebook_set_page( GTK_NOTEBOOK(m_widget), m_children.Number()-1 );
   
   gtk_page_change_callback( NULL, mdi_child->m_page, 0, this );
   gtk_notebook_set_page( GTK_NOTEBOOK(m_widget), m_children.Number()-1 );
   
   gtk_page_change_callback( NULL, mdi_child->m_page, 0, this );