wx/msw/notebook.h needs wx/notebook.h in lack of precompiled headers.

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

diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp
index ae28587509cf625723a3533da5717bae6d9c304d..a600836ce64989813d5341ec4c51842703f869e6 100644 (file)
--- a/src/msw/toplevel.cpp
+++ b/src/msw/toplevel.cpp
@@ -145,7 +145,7 @@ void wxTopLevelWindowMSW::Init()
 
     m_winLastFocused = (wxWindow *)NULL;
 
 
     m_winLastFocused = (wxWindow *)NULL;
 

-#ifdef __SMARTPHONE__
+#if defined(__SMARTPHONE__) && defined(__WXWINCE__)

     m_MenuBarHWND = 0;
 #endif
 }
     m_MenuBarHWND = 0;
 #endif
 }


@@ -174,7 +174,7 @@ WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const
     }
     //else: WS_OVERLAPPED is 0 anyhow, so it is on by default
 
     }
     //else: WS_OVERLAPPED is 0 anyhow, so it is on by default
 

-#ifndef __SMARTPHONE__
+#if !(defined(__SMARTPHONE__) && defined(__WXWINCE__))

     // border and caption styles
     if ( style & wxRESIZE_BORDER )
         msflags |= WS_THICKFRAME;
     // border and caption styles
     if ( style & wxRESIZE_BORDER )
         msflags |= WS_THICKFRAME;


@@ -529,7 +529,7 @@ bool wxTopLevelWindowMSW::Create(wxWindow *parent,
     }
 #endif
 
     }
 #endif
 

-#ifdef __SMARTPHONE__
+#if defined(__SMARTPHONE__) && defined(__WXWINCE__)

     SetRightMenu(); // to nothing for initialization
 #endif
 
     SetRightMenu(); // to nothing for initialization
 #endif