When a modal dialog is shown and the app isn't running, run the event

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

diff --git a/src/generic/notebook.cpp b/src/generic/notebook.cpp
index 5c73f3579ef34491a3ec8a095b59186183f49552..1c46df356864608fe50ce116e705e2e3f8edd260 100644 (file)
--- a/src/generic/notebook.cpp
+++ b/src/generic/notebook.cpp
@@ -20,6 +20,10 @@
 #pragma implementation "notebook.h"
 #endif
 
 #pragma implementation "notebook.h"
 #endif
 

+#ifdef __VMS
+#pragma message disable unscomzer
+#endif
+

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -157,9 +161,6 @@ int wxNotebook::GetRowCount() const
 
 int wxNotebook::SetSelection(size_t nPage)
 {
 
 int wxNotebook::SetSelection(size_t nPage)
 {

-    if (nPage == -1)
-      return 0;
-

     wxASSERT( IS_VALID_PAGE(nPage) );
 
 #if defined (__WIN16__)
     wxASSERT( IS_VALID_PAGE(nPage) );
 
 #if defined (__WIN16__)


@@ -340,18 +341,18 @@ wxWindow* wxNotebook::DoRemovePage(size_t nPage)
     {
       // Only change the selection if the page we
       // deleted was the selection.
     {
       // Only change the selection if the page we
       // deleted was the selection.

-      if (nPage == m_nSelection)
+      if (nPage == (size_t)m_nSelection)

       {
          m_nSelection = -1;
          // Select the first tab. Generates a ChangePage.
       {
          m_nSelection = -1;
          // Select the first tab. Generates a ChangePage.

-         m_tabView->SetTabSelection((int) (long) GetPage(0), TRUE);
+         m_tabView->SetTabSelection(0, TRUE);

       }
       else
       {
        // We must adjust which tab we think is selected.
         // If greater than the page we deleted, it must be moved down
         // a notch.
       }
       else
       {
        // We must adjust which tab we think is selected.
         // If greater than the page we deleted, it must be moved down
         // a notch.

-        if (m_nSelection > nPage)
+        if (size_t(m_nSelection) > nPage)

           m_nSelection -- ;
       }
     }
           m_nSelection -- ;
       }
     }