X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/caac51810b1f16f00061b4cf96db7ff349c0d16d..903f689bf7c3c379cba45881373aa9bdd15d6e70:/src/gtk/notebook.cpp

diff --git a/src/gtk/notebook.cpp b/src/gtk/notebook.cpp
index 089d875e5c..a2c5f2f9df 100644
--- a/src/gtk/notebook.cpp
+++ b/src/gtk/notebook.cpp
@@ -16,6 +16,7 @@
 #include "wx/panel.h"
 #include "wx/utils.h"
 #include "wx/imaglist.h"
+#include "wx/intl.h"
 #include "wx/log.h"
 
 //-----------------------------------------------------------------------------
@@ -109,10 +110,6 @@ static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation*
 // wxNotebook
 //-----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxNotebook, wxControl)
-  EVT_SIZE(wxNotebook::OnSize)
-END_EVENT_TABLE()
-
 IMPLEMENT_DYNAMIC_CLASS(wxNotebook,wxControl)
 
 void wxNotebook::Init()
@@ -188,7 +185,7 @@ int wxNotebook::GetSelection() const
     node = node->Next();
   };
 
-  wxCHECK_MSG( node != NULL, -1, "wxNotebook: no selection?");
+  wxCHECK_MSG( node != NULL, -1, "wxNotebook: no selection?" );
 
   return page->m_id;
 };
@@ -305,12 +302,12 @@ bool wxNotebook::SetPageImage( int page, int image )
 
 void wxNotebook::SetPageSize( const wxSize &WXUNUSED(size) )
 {
-  wxFAIL_MSG("wxNotebook::SetPageSize not implemented");
+  wxFAIL_MSG(_("wxNotebook::SetPageSize not implemented"));
 };
 
 void wxNotebook::SetPadding( const wxSize &WXUNUSED(padding) )
 {
-  wxFAIL_MSG("wxNotebook::SetPadding not implemented");
+  wxFAIL_MSG(_("wxNotebook::SetPadding not implemented"));
 };
 
 bool wxNotebook::DeleteAllPages()
@@ -373,7 +370,7 @@ bool wxNotebook::AddPage(wxWindow* win, const wxString& text,
   };
 
   wxCHECK_MSG(page != NULL, FALSE,
-              "Can't add a page whose parent is not the notebook!");
+              _("Can't add a page whose parent is not the notebook!"));
 
   // then set the attributes
   page->m_text = text;
@@ -400,17 +397,12 @@ wxWindow *wxNotebook::GetPage( int page ) const
 
 void wxNotebook::AddChild( wxWindow *win )
 {
-  // @@@ normally done in wxWindow::AddChild but for some reason wxNotebook
-  // case is special there (Robert?)
-  // Robert: Don't you think the code below looks different from the one
-  // in wxWindow::AddChild :-)
-
   m_children.Append(win);
 
   wxNotebookPage *page = new wxNotebookPage();
 
   page->m_id = GetPageCount();
-  page->m_label = (GtkLabel *)gtk_label_new("Handle");
+  page->m_label = (GtkLabel *)gtk_label_new(_("Handle"));
   page->m_client = win;
   gtk_notebook_append_page( GTK_NOTEBOOK(m_widget), win->m_widget,
                             (GtkWidget *)page->m_label);
@@ -426,7 +418,7 @@ void wxNotebook::AddChild( wxWindow *win )
 
   if (!page->m_page)
   {
-     wxLogFatalError( "Notebook page creation error" );
+     wxLogFatalError( _("Notebook page creation error") );
      return;
   }
 
@@ -434,13 +426,13 @@ void wxNotebook::AddChild( wxWindow *win )
 };
 
 // override these 2 functions to do nothing: everything is done in OnSize
-void wxNotebook::SetConstraintSizes(bool /* recurse */)
+void wxNotebook::SetConstraintSizes( bool WXUNUSED(recurse) )
 {
   // don't set the sizes of the pages - their correct size is not yet known
   wxControl::SetConstraintSizes(FALSE);
 }
 
-bool wxNotebook::DoPhase(int /* nPhase */)
+bool wxNotebook::DoPhase( int WXUNUSED(nPhase) )
 {
   return TRUE;
 }