1. some more tests in console

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

diff --git a/src/generic/notebook.cpp b/src/generic/notebook.cpp
index a398e2a5467f0d59f6d4134dd8f70300a3c2469e..97019ea950f3b8153a30bdee18dab1de62b23d1c 100644 (file)
--- a/src/generic/notebook.cpp
+++ b/src/generic/notebook.cpp
@@ -45,7 +45,6 @@
 // event table
 // ----------------------------------------------------------------------------
 
 // event table
 // ----------------------------------------------------------------------------
 

-#if !USE_SHARED_LIBRARIES

 BEGIN_EVENT_TABLE(wxNotebook, wxControl)
     EVT_NOTEBOOK_PAGE_CHANGED(-1, wxNotebook::OnSelChange)
     EVT_SIZE(wxNotebook::OnSize)
 BEGIN_EVENT_TABLE(wxNotebook, wxControl)
     EVT_NOTEBOOK_PAGE_CHANGED(-1, wxNotebook::OnSelChange)
     EVT_SIZE(wxNotebook::OnSize)


@@ -58,7 +57,6 @@ END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxNotebook, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxCommandEvent)
 
 IMPLEMENT_DYNAMIC_CLASS(wxNotebook, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxCommandEvent)

-#endif

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -569,7 +567,7 @@ bool wxNotebook::DoPhase(int /* nPhase */)
     return TRUE;
 }
 
     return TRUE;
 }
 

-void wxNotebook::Command(wxCommandEvent& event)
+void wxNotebook::Command(wxCommandEvent& WXUNUSED(event))

 {
     wxFAIL_MSG("wxNotebook::Command not implemented");
 }
 {
     wxFAIL_MSG("wxNotebook::Command not implemented");
 }


@@ -594,12 +592,12 @@ void wxNotebook::ChangePage(int nOldSel, int nSel)
     wxRect clientRect = GetAvailableClientSize();
     pPage->SetSize(clientRect.x, clientRect.y, clientRect.width, clientRect.height);
 
     wxRect clientRect = GetAvailableClientSize();
     pPage->SetSize(clientRect.x, clientRect.y, clientRect.width, clientRect.height);
 

+    Refresh();
+

     pPage->Show(TRUE);
     pPage->Raise();
     pPage->SetFocus();
 
     pPage->Show(TRUE);
     pPage->Raise();
     pPage->SetFocus();
 

-    Refresh();
-

     m_nSelection = nSel;
 }
 
     m_nSelection = nSel;
 }