X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/07c19327922deabc5f140ea3659e65e1c37a5d65..c27bcbd5a7cec9f03b15c69824da99c5bb75924a:/src/msw/notebook.cpp

diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp
index e738530676..49436dcb63 100644
--- a/src/msw/notebook.cpp
+++ b/src/msw/notebook.cpp
@@ -94,9 +94,7 @@ DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING)
 
 BEGIN_EVENT_TABLE(wxNotebook, wxControl)
     EVT_NOTEBOOK_PAGE_CHANGED(-1, wxNotebook::OnSelChange)
-
     EVT_SIZE(wxNotebook::OnSize)
-
     EVT_NAVIGATION_KEY(wxNotebook::OnNavigationKey)
 END_EVENT_TABLE()
 
@@ -135,6 +133,8 @@ wxBEGIN_FLAGS( wxNotebookStyle )
     wxFLAGS_MEMBER(wxNB_LEFT)
     wxFLAGS_MEMBER(wxNB_RIGHT)
     wxFLAGS_MEMBER(wxNB_BOTTOM)
+    wxFLAGS_MEMBER(wxNB_NOPAGETHEME)
+    wxFLAGS_MEMBER(wxNB_FLAT)
 
 wxEND_FLAGS( wxNotebookStyle )
 
@@ -305,6 +305,19 @@ bool wxNotebook::Create(wxWindow *parent,
             SetBackgroundColour(col);
         }
     }
+
+    // Undocumented hack to get flat notebook style
+    // In fact, we should probably only do this in some
+    // curcumstances, i.e. if we know we will have a border
+    // at the bottom (the tab control doesn't draw it itself)
+#if defined(__POCKETPC__) || defined(__SMARTPHONE__)
+    if (HasFlag(wxNB_FLAT))
+    {
+        SendMessage(m_hwnd, CCM_SETVERSION, COMCTL32_VERSION, 0);
+        if (!m_hasBgCol)
+            SetBackgroundColour(*wxWHITE);
+    }
+#endif
     return true;
 }
 
@@ -324,7 +337,7 @@ WXDWORD wxNotebook::MSWGetStyle(long style, WXDWORD *exstyle) const
     else if ( style & wxNB_LEFT )
         tabStyle |= TCS_VERTICAL;
     else if ( style & wxNB_RIGHT )
-        tabStyle |= TCS_VERTICAL | TCS_RIGHT;
+        tabStyle |= TCS_VERTICAL | TCS_RIGHT; 
 
     // ex style
     if ( exstyle )
@@ -731,6 +744,15 @@ void wxNotebook::OnSize(wxSizeEvent& event)
     UpdateBgBrush();
 #endif // wxUSE_UXTHEME
 
+    if (GetPageCount() == 0)
+    {
+        // Prevents droppings on resize, but does cause some flicker
+        // when there are no pages.
+        Refresh(false);
+        event.Skip();
+        return;
+    }
+
     // fit all the notebook pages to the tab control's display area
 
     RECT rc;
@@ -994,6 +1016,17 @@ wxColour wxNotebook::MSWGetBgColourForChild(wxWindow *win)
     if ( m_hasBgCol )
         return GetBackgroundColour();
 
+    // Experimental: don't do this since we're doing it in wxPanel
+#if 0 // defined(__POCKETPC__) || defined(__SMARTPHONE__)
+    // For some reason, the pages will be grey by default.
+    // Normally they should be white on these platforms.
+    // (However the static control backgrounds are painted
+    // in the correct colour, just not the rest of it.)
+    // So let's give WinCE a hint.
+    else if (!win->m_hasBgCol)
+        return *wxWHITE;
+#endif
+
     if ( !wxUxThemeEngine::GetIfActive() )
         return wxNullColour;
 
@@ -1007,6 +1040,12 @@ wxNotebook::MSWPrintChild(wxWindow *win,
                           WXWPARAM wParam,
                           WXLPARAM WXUNUSED(lParam))
 {
+    // Don't paint the theme for the child if we have a solid
+    // background
+    if (m_hasBgCol || HasFlag(wxNB_NOPAGETHEME) || (wxSystemOptions::HasOption(wxT("msw.notebook.themed-background")) &&
+                                      wxSystemOptions::GetOptionInt(wxT("msw.notebook.themed-background")) == 0))
+        return false;
+    
     RECT rc;
     ::GetClientRect(GetHwnd(), &rc);
     TabCtrl_AdjustRect(GetHwnd(), true, &rc);