fixed suppressing of wxFontMapper questions which was broken by GUI/base separation...

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

diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp
index 1b82f24ba1d9b6d2fa476a2a136d3e94c323e3cc..c09e5fc08507ec85097f549a3a12949f6c2679ff 100644 (file)
--- a/src/msw/notebook.cpp
+++ b/src/msw/notebook.cpp
@@ -175,7 +175,7 @@ bool wxNotebook::Create(wxWindow *parent,
                         wxDefaultValidator, name) )
         return FALSE;
 
                         wxDefaultValidator, name) )
         return FALSE;
 

-    if ( !MSWCreateControl(WC_TABCONTROL, _T(""), pos, size) )
+    if ( !MSWCreateControl(WC_TABCONTROL, wxEmptyString, pos, size) )

         return FALSE;
 
     SetBackgroundColour(wxColour(::GetSysColor(COLOR_BTNFACE)));
         return FALSE;
 
     SetBackgroundColour(wxColour(::GetSysColor(COLOR_BTNFACE)));


@@ -265,7 +265,7 @@ bool wxNotebook::SetPageText(int nPage, const wxString& strText)
 
 wxString wxNotebook::GetPageText(int nPage) const
 {
 
 wxString wxNotebook::GetPageText(int nPage) const
 {

-  wxCHECK_MSG( IS_VALID_PAGE(nPage), wxT(""), wxT("notebook page out of range") );
+  wxCHECK_MSG( IS_VALID_PAGE(nPage), wxEmptyString, wxT("notebook page out of range") );

 
   wxChar buf[256];
   TC_ITEM tcItem;
 
   wxChar buf[256];
   TC_ITEM tcItem;


@@ -668,9 +668,9 @@ void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event)
         // OnSetFocus() because we don't know which direction the focus came
         // from in this case and so can't choose between setting the focus to
         // first or last panel child
         // OnSetFocus() because we don't know which direction the focus came
         // from in this case and so can't choose between setting the focus to
         // first or last panel child

-

         wxWindow *parent = GetParent();
         wxWindow *parent = GetParent();

-        if ( event.GetEventObject() == parent )
+        // the cast is here to fic a GCC ICE
+        if ( ((wxWindow*)event.GetEventObject()) == parent )

         {
             // no, it doesn't come from child, case (b): forward to a page
             if ( m_nSelection != -1 )
         {
             // no, it doesn't come from child, case (b): forward to a page
             if ( m_nSelection != -1 )


@@ -822,7 +822,7 @@ void wxNotebook::ApplyThemeBackground(wxWindow* window, const wxColour& colour)
         window->SetBackgroundColour(colour);
     }
 
         window->SetBackgroundColour(colour);
     }
 

-    for ( wxWindowList::Node *node = window->GetChildren().GetFirst(); node; node = node->GetNext() )
+    for ( wxWindowList::compatibility_iterator node = window->GetChildren().GetFirst(); node; node = node->GetNext() )

     {
         wxWindow *child = node->GetData();
         ApplyThemeBackground(child, colour);
     {
         wxWindow *child = node->GetData();
         ApplyThemeBackground(child, colour);