Disable typemap for wxImage constructors

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

diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp
index da9b748679a932185471db1b2d59b5625f5c6498..eb4410c99cce3b35e5ed0ba54807773e183e471b 100644 (file)
--- a/src/msw/notebook.cpp
+++ b/src/msw/notebook.cpp
@@ -184,6 +184,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxNotifyEvent)
 // local functions
 // ----------------------------------------------------------------------------
 
+#ifndef __WXWINCE__
 // apparently DrawThemeBackground() modifies the rect passed to it and if we
 // don't call this function there are some drawing artifacts which are only
 // visible with some non default themes; so modify the rect here so that it
@@ -196,6 +197,7 @@ static void AdjustRectForThemeBg(RECT& rc)
     rc.right  += 4;
     rc.bottom += 5;
 }
+#endif
 
 // ============================================================================
 // implementation
@@ -256,6 +258,13 @@ bool wxNotebook::Create(wxWindow *parent,
                         long style,
                         const wxString& name)
 {
+#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
+    
     // comctl32.dll 6.0 doesn't support non-top tabs with visual styles (the
     // control is simply not rendered correctly), so disable them in this case
     const int verComCtl32 = wxApp::GetComCtl32Version();
@@ -763,7 +772,7 @@ void wxNotebook::OnSize(wxSizeEvent& event)
     {
         // Prevents droppings on resize, but does cause some flicker
         // when there are no pages.
-        Refresh(false);
+        Refresh();
         event.Skip();
         return;
     }