Fixes for WinCE

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

diff --git a/docs/latex/wx/wx.hpj b/docs/latex/wx/wx.hpj
index 04f130ced31f74cf1549abbe3f6c84922236cd77..07caa08baef45d5d7ae96c44a3979ebba6f9b82c 100644 (file)
--- a/docs/latex/wx/wx.hpj
+++ b/docs/latex/wx/wx.hpj
@@ -1,5 +1,5 @@
 [OPTIONS]
 [OPTIONS]

-BMROOT=c:\wx2dev\wxWindows\docs/latex/wx ; Assume that bitmaps are where the source is
+BMROOT=c:\wx2dev\wxWind~1\docs/latex/wx ; Assume that bitmaps are where the source is

 TITLE=wxWindows Manual
 CONTENTS=Contents
 COMPRESS=HIGH
 TITLE=wxWindows Manual
 CONTENTS=Contents
 COMPRESS=HIGH

diff --git a/include/wx/app.h b/include/wx/app.h
index cc050b1d3decc39b461c9cca98a416e3351875b0..07d930dff4cce57aab9ca4d66cfee60d1c08c155 100644 (file)
--- a/include/wx/app.h
+++ b/include/wx/app.h
@@ -604,11 +604,17 @@ public:
     // we need HINSTANCE declaration to define WinMain()
     #include "wx/msw/wrapwin.h"
 
     // we need HINSTANCE declaration to define WinMain()
     #include "wx/msw/wrapwin.h"
 

+    #ifdef SW_SHOWNORMAL
+    #define wxSW_SHOWNORMAL SW_SHOWNORMAL
+    #else
+    #define wxSW_SHOWNORMAL 0
+    #endif
+

     #define IMPLEMENT_WXWIN_MAIN \
         extern int wxEntry(HINSTANCE hInstance,                               \
                            HINSTANCE hPrevInstance = NULL,                    \
                            char *pCmdLine = NULL,                             \
     #define IMPLEMENT_WXWIN_MAIN \
         extern int wxEntry(HINSTANCE hInstance,                               \
                            HINSTANCE hPrevInstance = NULL,                    \
                            char *pCmdLine = NULL,                             \

-                           int nCmdShow = SW_NORMAL);                         \
+                           int nCmdShow = wxSW_SHOWNORMAL);                         \

         extern "C" int WINAPI WinMain(HINSTANCE hInstance,                    \
                                       HINSTANCE hPrevInstance,                \
                                       char *lpCmdLine,                        \
         extern "C" int WINAPI WinMain(HINSTANCE hInstance,                    \
                                       HINSTANCE hPrevInstance,                \
                                       char *lpCmdLine,                        \

diff --git a/include/wx/toolbar.h b/include/wx/toolbar.h
index c2ba87c44a33d9cb846e131a987077a5662bde39..4e1a581f47d85975f8256c981d446961595e9ba8 100644 (file)
--- a/include/wx/toolbar.h
+++ b/include/wx/toolbar.h
@@ -55,7 +55,9 @@ enum
 #if wxUSE_TOOLBAR
     #include "wx/tbarbase.h"     // the base class for all toolbars
 
 #if wxUSE_TOOLBAR
     #include "wx/tbarbase.h"     // the base class for all toolbars
 

-    #if !wxUSE_TOOLBAR_NATIVE && !defined(__WXUNIVERSAL__)
+    // Simple toolbar no longer available, so we will need to have
+    // a generic toolbar at some point (perhaps the wxUniv toolbar)
+    #if 0 // !wxUSE_TOOLBAR_NATIVE && !defined(__WXUNIVERSAL__)

         #include "wx/tbarsmpl.h"
 
         class WXDLLEXPORT wxToolBar : public wxToolBarSimple
         #include "wx/tbarsmpl.h"
 
         class WXDLLEXPORT wxToolBar : public wxToolBarSimple