WinCE Standard SDK improvements including adding close button

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

include/wx/chkconf.h

@@ -1132,12 +1132,12 @@
 #endif /* wxMGL */
 
 /* Hopefully we can emulate these dialogs in due course */
-#if wxUSE_SMARTPHONE
+#ifdef __SMARTPHONE__
 #   ifdef wxUSE_COLOURDLG
 #       undef wxUSE_COLOURDLG
 #       define wxUSE_COLOURDLG 0
 #   endif
-#endif /* wxUSE_SMARTPHONE */
+#endif /* __SMARTPHONE__ */
 
 
 /* generic controls dependencies */

include/wx/msw/frame.h

@@ -109,6 +109,7 @@ protected:
     // override base class virtuals
     virtual void DoGetClientSize(int *width, int *height) const;
     virtual void DoSetClientSize(int width, int height);
+	virtual wxPoint GetClientAreaOrigin() const;
 
 #if wxUSE_MENUS_NATIVE
     // perform MSW-specific action when menubar is changed

include/wx/msw/menu.h

@@ -172,14 +172,15 @@ public:
     virtual void Detach();
     virtual void Attach(wxFrame *frame);
 
-#if wxUSE_TOOLBAR && defined(__WXWINCE__) && (_WIN32_WCE < 400 || defined(WIN32_PLATFORM_PSPC) || defined(WIN32_PLATFORM_WFSP))
+#if wxUSE_TOOLBAR && defined(__WXWINCE__) && (_WIN32_WCE < 400 || defined(__POCKETPC__) || defined(__SMARTPHONE__))
     // Under WinCE, a menubar is owned by the frame's toolbar
     void SetToolBar(wxToolBar* toolBar) { m_toolBar = toolBar; }
     wxToolBar* GetToolBar() const { return m_toolBar; }
 #endif
 
-#if defined(__WXWINCE__) && (_WIN32_WCE >= 400 && !defined(WIN32_PLATFORM_PSPC) && !defined(WIN32_PLATFORM_WFSP))
+#if defined(__WXWINCE__) && (_WIN32_WCE >= 400 && !defined(__POCKETPC__) && !defined(__SMARTPHONE__))
     WXHWND GetCommandBar() const { return m_commandBar; }
+    bool AddAdornments(long style);
 #endif
 
 #if wxUSE_ACCEL
@@ -224,8 +225,9 @@ protected:
     // Not using a combined wxToolBar/wxMenuBar? then use
     // a commandbar in WinCE .NET to implement the
     // menubar, since there is no ::SetMenu function.
-#if defined(__WXWINCE__) && (_WIN32_WCE >= 400 && !defined(WIN32_PLATFORM_PSPC) && !defined(WIN32_PLATFORM_WFSP))
+#if defined(__WXWINCE__) && (_WIN32_WCE >= 400 && !defined(__POCKETPC__) && !defined(__SMARTPHONE__))
     WXHWND      m_commandBar;
+    bool        m_adornmentsAdded;
 #endif
 
 private:

include/wx/msw/wince/libraries.h

@@ -27,16 +27,16 @@
     #pragma comment(lib,"commdlg.lib")
 #endif
 
-#if defined(WCE_PLATFORM_STANDARDSDK)
+#if defined(__WINCE_STANDARDSDK__)
     // DoDragDrop:
     #pragma comment(lib,"olece400.lib")
-#elif defined(WIN32_PLATFORM_PSPC)
+#elif defined(__POCKETPC__)
     // PocketPC build:
     // DoDragDrop:
     #pragma comment(lib,"ceshell.lib")
 
     #pragma comment(lib,"aygshell.lib")
-#elif defined(WIN32_PLATFORM_WFSP)
+#elif defined(__SMARTPHONE__)
     // Smartphone build:
     #pragma comment(lib,"ceshell.lib")
     #pragma comment(lib,"aygshell.lib")

include/wx/msw/wince/missing.h

@@ -25,7 +25,7 @@ inline BOOL IsIconic( HWND WXUNUSED(hWnd) )
     return FALSE;
 }
 
-#ifdef WIN32_PLATFORM_PSPC
+#ifdef __POCKETPC__
 #define SM_CXCURSOR             13
 #define SM_CYCURSOR             14
 #endif

include/wx/msw/wince/setup.h

@@ -1070,27 +1070,6 @@
 // (notably, wxNotebook pages)
 #define wxUSE_UXTHEME_AUTO      0
 
-// Set to 1 if you want to maintain a PocketPC-style UI on
-// Windows CE .NET. If 0, wxWidgets will use a commandbar
-// for the menubar, and a normal separate toolbar as per the
-// desktop implementation. If 1, wxWidgets will combine
-// the toolbar and menubar as per the PocketPC implementation.
-//
-// Note that at present, the dynamic loading of PocketPC
-// shell functions on WinCE .NET is not yet done, and a
-// simple commandbar implementation is used instead of the
-// PocketPC one. The intention is to use the PocketPC style
-// when available (when wxUSE_POCKETPC_UI is 1).
-//
-// So if you're using WinCE .NET, and wxUSE_POCKETPC_UI is 0,
-// you will be able to create separate toolbars and menubars,
-// but _not_ the combined toolbar/menubar.
-
-// NOW OBSOLETE: we test WIN32_PLATFORM_PSPC and WIN32_PLATFORM_WFSP
-// instead
-
-// #define wxUSE_POCKETPC_UI       1
-
 // ----------------------------------------------------------------------------
 // obsolete settings
 // ----------------------------------------------------------------------------

include/wx/platform.h

@@ -127,6 +127,20 @@
 #    endif
 #endif
 
+/* detect PocketPC */
+#if defined( WIN32_PLATFORM_PSPC )
+#    ifndef __POCKETPC__
+#        define __POCKETPC__
+#    endif
+#endif
+
+/* detect Standard WinCE SDK */
+#if defined( WCE_PLATFORM_STANDARDSDK )
+#    ifndef __WINCE_STANDARDSDK__
+#        define __WINCE_STANDARDSDK__
+#    endif
+#endif
+
 /*
    Include wx/setup.h for the Unix platform defines generated by configure and
    the library compilation options

include/wx/toolbar.h

@@ -123,7 +123,7 @@ enum
     #else // wxUSE_TOOLBAR_NATIVE
         #if defined(__WXUNIVERSAL__)
            #include "wx/univ/toolbar.h"
-        #elif defined(__WXMSW__) && (!defined(_WIN32_WCE) || (_WIN32_WCE >= 400 && !defined(WIN32_PLATFORM_PSPC) && !defined(WIN32_PLATFORM_WFSP)))
+        #elif defined(__WXMSW__) && (!defined(_WIN32_WCE) || (_WIN32_WCE >= 400 && !defined(__POCKETPC__) && !defined(__SMARTPHONE__)))
            #include "wx/msw/tbar95.h"
         #elif defined(__WXWINCE__)
            #include "wx/msw/wince/tbarwce.h"

include/wx/toplevel.h

@@ -65,9 +65,11 @@ class WXDLLEXPORT wxTopLevelWindowBase;
 // "correctly", i.e. as full screen windows with a "hide" button (same as
 // "close" but round instead of squared and just hides the applications
 // instead of closing it) in the title bar
-#if defined(__WXWINCE__) && !defined(WCE_PLATFORM_STANDARDSDK)
-	#ifdef __SMARTPHONE__
+#if defined(__WXWINCE__)
+	#if defined(__SMARTPHONE__)
 		#define wxDEFAULT_FRAME_STYLE (wxMAXIMIZE)
+    #elif defined(__WINCE_STANDARDSDK__)
+		#define wxDEFAULT_FRAME_STYLE (wxMAXIMIZE|wxCLOSE_BOX)
 	#else
 		#define wxDEFAULT_FRAME_STYLE (0)
 	#endif