Use bottom flat notebook on PocketPC by default.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39635 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/widgets/widgets.cpp b/samples/widgets/widgets.cpp
index 3e7ab3663bd9902338263b48ec0de2aae928e345..25d11d88b78c520ca9992691996f51edcdde8426 100644 (file)
--- a/samples/widgets/widgets.cpp
+++ b/samples/widgets/widgets.cpp
@@ -382,7 +382,7 @@ WidgetsFrame::WidgetsFrame(const wxString& title)
     // we have 2 panes: book with pages demonstrating the controls in the
     // upper one and the log window with some buttons in the lower
 
-    int style = wxNO_FULL_REPAINT_ON_RESIZE|wxCLIP_CHILDREN|WidgetBookStyle;
+    int style = wxNO_FULL_REPAINT_ON_RESIZE|wxCLIP_CHILDREN|wxBK_DEFAULT;
     // Uncomment to suppress page theme (draw in solid colour)
     //style |= wxNB_NOPAGETHEME;
 
@@ -479,7 +479,7 @@ void WidgetsFrame::InitBook()
                                          wxID_ANY,
                                          wxDefaultPosition,
                                          wxDefaultSize,
-                                         WidgetBookStyle);
+                                         wxBK_DEFAULT);
 #endif
 
         for ( WidgetsPageInfo *info = WidgetsPage::ms_widgetPages;

diff --git a/samples/widgets/widgets.h b/samples/widgets/widgets.h
index 0aca377a0b9acb10a525de55d6bfa6bcf646546b..da451951f9268b7255e09ba9e12a1ddfcfa8b6df 100644 (file)
--- a/samples/widgets/widgets.h
+++ b/samples/widgets/widgets.h
@@ -18,18 +18,12 @@
     #define WidgetsBookCtrl wxTreebook
     #define WidgetsBookCtrlEvent wxTreebookEvent
     #define EVT_WIDGETS_PAGE_CHANGED(id,func) EVT_TREEBOOK_PAGE_CHANGED(id,func)
-    #define WidgetBookStyle (wxBK_DEFAULT)
 #else
     #include "wx/bookctrl.h"
     #define USE_TREEBOOK 0
     #define WidgetsBookCtrl wxBookCtrl
     #define WidgetsBookCtrlEvent wxBookCtrlEvent
     #define EVT_WIDGETS_PAGE_CHANGED(id,func) EVT_BOOKCTRL_PAGE_CHANGED(id,func)
-    #ifdef __POCKETPC__
-        #define WidgetBookStyle (wxBK_BOTTOM|wxNB_FLAT)
-    #else
-        #define WidgetBookStyle (wxBK_DEFAULT)
-    #endif
 #endif
 
 #if wxUSE_LOG && !defined(__WXHANDHELD__)

diff --git a/src/generic/propdlg.cpp b/src/generic/propdlg.cpp
index 5b1fa5d1d5ca7e512b73dd194fcaad197212cfba..12dae96c8256a446de1315df854eb95cfe9fbada 100644 (file)
--- a/src/generic/propdlg.cpp
+++ b/src/generic/propdlg.cpp
@@ -135,12 +135,7 @@ void wxPropertySheetDialog::CreateButtons(int flags)
 // Creates the book control
 wxBookCtrlBase* wxPropertySheetDialog::CreateBookCtrl()
 {
-    int style = wxCLIP_CHILDREN;
-#if defined(__POCKETPC__) && wxUSE_NOTEBOOK
-    style |= wxBK_BOTTOM|wxNB_FLAT;
-#else
-    style |= wxBK_DEFAULT;
-#endif
+    int style = wxCLIP_CHILDREN | wxBK_DEFAULT;
 
     wxBookCtrlBase* bookCtrl = NULL;
 

diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp
index e92244917aa1946d6ff8c3b05c974dffa3ff7575..0d8d2bb56d93cc051c81de5894b8f85cc06a0cb0 100644 (file)
--- a/src/msw/notebook.cpp
+++ b/src/msw/notebook.cpp
@@ -268,14 +268,21 @@ bool wxNotebook::Create(wxWindow *parent,
                         long style,
                         const wxString& name)
 {
+    if ( (style & wxBK_ALIGN_MASK) == wxBK_DEFAULT )
+    {
+#if defined(__POCKETPC__)
+        style |= wxBK_BOTTOM | wxNB_FLAT;
+#else
+        style |= wxBK_TOP;
+#endif
+    }
+
 #ifdef __WXWINCE__
     // Not sure why, but without this style, there is no border
     // around the notebook tabs.
     if (style & wxNB_FLAT)
         style |= wxBORDER_SUNKEN;
 #endif
-    if ( (style & wxBK_ALIGN_MASK) == wxBK_DEFAULT )
-        style |= wxBK_TOP;
 
 #if !wxUSE_UXTHEME
     // ComCtl32 notebook tabs simply don't work unless they're on top if we have uxtheme, we can