WinCE fixes from "Viktor Voroshylo" <viktor@voroshylo.com>

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

diff --git a/include/wx/arrstr.h b/include/wx/arrstr.h
index 4cf5cc4accdcfc36b5c925ef26beafb9a46438bc..34011d8df7e0355219f5734b67e794934063c79a 100644 (file)
--- a/include/wx/arrstr.h
+++ b/include/wx/arrstr.h
@@ -15,8 +15,8 @@
 #include "wx/defs.h"
 #include "wx/string.h"
 
-WXDLLIMPEXP_BASE int wxStringSortAscending(wxString*, wxString*);
-WXDLLIMPEXP_BASE int wxStringSortDescending(wxString*, wxString*);
+WXDLLIMPEXP_BASE int wxCMPFUNC_CONV wxStringSortAscending(wxString*, wxString*);
+WXDLLIMPEXP_BASE int wxCMPFUNC_CONV wxStringSortDescending(wxString*, wxString*);
 
 #if wxUSE_STL
 

diff --git a/include/wx/msw/wince/missing.h b/include/wx/msw/wince/missing.h
index 08fb428b8748c98c58bb942dac013e4abdcf9083..22df67f45dfaaf80f3c158de8a9fda20e24523ab 100644 (file)
--- a/include/wx/msw/wince/missing.h
+++ b/include/wx/msw/wince/missing.h
@@ -12,7 +12,7 @@
 #ifndef _WX_CE_MISSING_H_
 #define _WX_CE_MISSING_H_
 
-BOOL IsIconic( HWND hWnd )
+inline BOOL IsIconic( HWND hWnd )
 {
     // Probably not right...
 #if 0
@@ -22,6 +22,10 @@ BOOL IsIconic( HWND hWnd )
     return FALSE;
 }
 
+#ifdef WIN32_PLATFORM_PSPC
+#define SM_CXCURSOR             13
+#define SM_CYCURSOR             14
+#endif
 
 /*
 Most of these are in MSVC++6.0   <wx\wince\winuser.h>

diff --git a/src/common/string.cpp b/src/common/string.cpp
index f0cb6d2910382f5efead05073558b808ca9d5c2d..aa461904f498b58daab618ee883fb97f27159fc8 100644 (file)
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -2325,12 +2325,12 @@ bool wxArrayString::operator==(const wxArrayString& a) const
 
 #endif // !wxUSE_STL
 
-int wxStringSortAscending(wxString* s1, wxString* s2)
+int wxCMPFUNC_CONV wxStringSortAscending(wxString* s1, wxString* s2)
 {
     return wxStrcmp(s1->c_str(), s2->c_str());
 }
 
-int wxStringSortDescending(wxString* s1, wxString* s2)
+int wxCMPFUNC_CONV wxStringSortDescending(wxString* s1, wxString* s2)
 {
     return -wxStrcmp(s1->c_str(), s2->c_str());
 }

diff --git a/src/common/wxchar.cpp b/src/common/wxchar.cpp
index 846e7d5058198cf6d5ed0e546cbe47f32ff76408..06c69bd0cd0319719a899c40ca10bfd4883c1f97 100644 (file)
--- a/src/common/wxchar.cpp
+++ b/src/common/wxchar.cpp
@@ -1389,7 +1389,7 @@ int isascii( int c )
 }
 #endif
 
-#if defined(__WXWINCE__)
+#if defined(__WXWINCE__) && (_WIN32_WCE <= 211)
 #if (_WIN32_WCE < 300)
 void *calloc( size_t num, size_t size )
 {
@@ -1399,12 +1399,10 @@ void *calloc( size_t num, size_t size )
 }
 #endif
 
-#if (_WIN32_WCE <= 211)
 int isspace(int c)
 {
     return (c == ' ');
 }
-#endif
 
 #endif
 

diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp
index 41b405cf024f599ac1638d6d416435127e49380b..ad330b9af6d5cdf8b22322b1aa4d69a8f0a4debc 100644 (file)
--- a/src/generic/dirctrlg.cpp
+++ b/src/generic/dirctrlg.cpp
@@ -361,7 +361,7 @@ bool wxIsDriveAvailable(const wxString& dirName)
 
 // Function which is called by quick sort. We want to override the default wxArrayString behaviour,
 // and sort regardless of case.
-static int LINKAGEMODE wxDirCtrlStringCompareFunction(wxString* strFirst, wxString* strSecond)
+static int wxCMPFUNC_CONV wxDirCtrlStringCompareFunction(wxString* strFirst, wxString* strSecond)
 {
     return strFirst->CmpNoCase(*strSecond);
 }

diff --git a/src/msw/dragimag.cpp b/src/msw/dragimag.cpp
index de1e7b088e6891130e533415085743a05070b01c..0789752ef0613378373fcdb9bcaaa6897cfe7dd2 100644 (file)
--- a/src/msw/dragimag.cpp
+++ b/src/msw/dragimag.cpp
@@ -51,6 +51,10 @@
 #include "wx/msw/dragimag.h"
 #include "wx/msw/private.h"
 
+#ifdef __WXWINCE__  // for SM_CXCURSOR and SM_CYCURSOR
+#include "wx/msw/wince/missing.h"
+#endif // __WXWINCE__
+
 #if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__))
 #include <commctrl.h>
 #endif

diff --git a/src/msw/menu.cpp b/src/msw/menu.cpp
index 30e097fa4749288b4b32e2de705dd8c37a143cd4..cf6c36043a6f2323989c58a140e8165a20830922 100644 (file)
--- a/src/msw/menu.cpp
+++ b/src/msw/menu.cpp
@@ -49,6 +49,7 @@
 #include <windowsx.h>
 #include <tchar.h>
 #include <ole2.h>
+#include <shellapi.h>
 #include <commctrl.h>
 #include <aygshell.h>
 

diff --git a/src/msw/settings.cpp b/src/msw/settings.cpp
index 6087406cf4c25b4fd21baeb5bed31927b2286abc..55939bf02b5b632f8a7caff798ef79ce53bcdc8a 100644 (file)
--- a/src/msw/settings.cpp
+++ b/src/msw/settings.cpp
@@ -40,6 +40,10 @@
 #include "wx/module.h"
 #include "wx/fontutil.h"
 
+#ifdef __WXWINCE__ // for SM_CXCURSOR and SM_CYCURSOR
+#include "wx/msw/wince/missing.h"
+#endif // __WXWINCE__
+
 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------
@@ -250,6 +254,7 @@ wxFont wxCreateFontFromStockObject(int index)
 
 wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)
 {
+#ifdef __WXWINCE__
     // this one is special: we don't get it from GetStockObject()
     if ( index == wxSYS_ICONTITLE_FONT )
     {
@@ -257,6 +262,7 @@ wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)
         SystemParametersInfo(SPI_GETICONTITLELOGFONT, sizeof(lf), &lf, 0);
         return wxCreateFontFromLogFont(&lf);
     }
+#endif // __WXWINCE__
 
     // wxWindow ctor calls GetSystemFont(wxSYS_DEFAULT_GUI_FONT) so we're
     // called fairly often - this is why we cache this particular font

diff --git a/src/msw/wince/tbarwce.cpp b/src/msw/wince/tbarwce.cpp
index 491006ad379fdf432549821b73fdb51265dd2c1d..a1be85a8c6ee174c7b5c412fc72c5624a13f9ffd 100644 (file)
--- a/src/msw/wince/tbarwce.cpp
+++ b/src/msw/wince/tbarwce.cpp
@@ -52,6 +52,7 @@
 #include <windowsx.h>
 #include <tchar.h>
 #include <ole2.h>
+#include <shellapi.h>
 #include <commctrl.h>
 #include <aygshell.h>
 

diff --git a/src/msw/wince/time.cpp b/src/msw/wince/time.cpp
index 22fd23687fd38732023f20a66ded1db52c6f98d0..b512e22ec7e80a3da2a2d97deb9cbec85a4b9561 100644 (file)
--- a/src/msw/wince/time.cpp
+++ b/src/msw/wince/time.cpp
@@ -173,7 +173,7 @@ time_t __cdecl time(time_t *t)
 ////////////////////////////////////////////////////////////////////////
 time_t __cdecl mktime(struct tm *t)
 {
-       return (common_tm_to_time(t->tm_mday, t->tm_mon, t->tm_year, t->tm_hour, t->tm_min, t->tm_sec)) ;
+       return (common_tm_to_time(t->tm_mday, t->tm_mon+1, t->tm_year+1900, t->tm_hour, t->tm_min, t->tm_sec)) ;
 }