argc == 0 bug fixed

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

diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp
index 28577f7992ff3c6e82ab78c9b6f24fc0910434ac..34e0b589af998ad257ff1eb6b72cf8abf736f886 100644 (file)
--- a/src/msw/notebook.cpp
+++ b/src/msw/notebook.cpp
@@ -27,20 +27,26 @@
 
 #include  <wx/log.h>
 #include  <wx/imaglist.h>
 
 #include  <wx/log.h>
 #include  <wx/imaglist.h>

+#include  <wx/event.h>
+#include  <wx/control.h>

 #include  <wx/notebook.h>
 
 #include  <wx/msw/private.h>
 
 // Windows standard headers
 #ifndef   __WIN95__
 #include  <wx/notebook.h>
 
 #include  <wx/msw/private.h>
 
 // Windows standard headers
 #ifndef   __WIN95__

-  #error  "wxNotebook is not supported under Windows 3.1"
+  #error  "wxNotebook is only supported Windows 95 and above"

 #endif    //Win95
 
 #include  <windowsx.h>  // for SetWindowFont
 
 #endif    //Win95
 
 #include  <windowsx.h>  // for SetWindowFont
 

+#ifndef __TWIN32__

 #ifdef __GNUWIN32__
   #include "wx/msw/gnuwin32/extra.h"
 #ifdef __GNUWIN32__
   #include "wx/msw/gnuwin32/extra.h"

-#else   //!GnuWin32
+#endif
+#endif
+
+#if !defined(__GNUWIN32__) || defined(__TWIN32__)

   #include <commctrl.h>
 #endif
 
   #include <commctrl.h>
 #endif
 


@@ -358,11 +364,13 @@ bool wxNotebook::InsertPage(int nPage,
 
 void wxNotebook::OnSize(wxSizeEvent& event)
 {
 
 void wxNotebook::OnSize(wxSizeEvent& event)
 {

-  // emulate page change (it's esp. important to do it first time because
-  // otherwise our page would stay invisible)
-  int nSel = m_nSelection;
-  m_nSelection = -1;
-  SetSelection(nSel);
+  // make sure the current page is shown and has focus (it's useful because all
+  // pages are created invisible initially)
+  if ( m_nSelection != -1 ) {
+    wxNotebookPage *pPage = m_aPages[m_nSelection];
+    pPage->Show(TRUE);
+    pPage->SetFocus();
+  }

 
   // fit the notebook page to the tab control's display area
   RECT rc;
 
   // fit the notebook page to the tab control's display area
   RECT rc;