don't lock the gs_prevCS critical section recursively (replaces patch 1857581)

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

diff --git a/src/gtk/notebook.cpp b/src/gtk/notebook.cpp
index c878f8728f9d9aadec9c02c66e10c6147c3d8f36..c063436f1ff59603b58c3e50d871abf383851ddc 100644 (file)
--- a/src/gtk/notebook.cpp
+++ b/src/gtk/notebook.cpp
@@ -101,9 +101,9 @@ static void gtk_notebook_page_changing_callback( GtkNotebook *widget,
 }
 
 extern "C" {
-static void gtk_notebook_page_changed_callback( GtkNotebook *widget,
+static void gtk_notebook_page_changed_callback( GtkNotebook * WXUNUSED(widget),
                                                 GtkNotebookPage *WXUNUSED(gpage),
-                                                guint page,
+                                                guint WXUNUSED(page),
                                                 wxNotebook *notebook )
 {
     int old = notebook->m_oldSelection;
@@ -169,9 +169,9 @@ static void wxInsertChildInNotebook(wxWindow* parent, wxWindow* child)
 // wxNotebook
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxNotebook,wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxNotebook,wxBookCtrlBase)
 
-BEGIN_EVENT_TABLE(wxNotebook, wxControl)
+BEGIN_EVENT_TABLE(wxNotebook, wxBookCtrlBase)
     EVT_NAVIGATION_KEY(wxNotebook::OnNavigationKey)
 END_EVENT_TABLE()