WinCE fixes

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

diff --git a/include/wx/msw/winundef.h b/include/wx/msw/winundef.h
index 41181e982a1c3382dbc841398d4831a45044c0c6..01dad4ad0dd078100ddbb103390997c0d6e0bf18 100644 (file)
--- a/include/wx/msw/winundef.h
+++ b/include/wx/msw/winundef.h
@@ -27,8 +27,8 @@
 
 // CreateDialog
 
-//#ifdef(CreateDialog)
 #if !defined(__WXWINCE__) && defined(CreateDialog)
+// #if defined(CreateDialog)
     #undef CreateDialog
 
     inline HWND CreateDialog(HINSTANCE hInstance,

diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp
index c7e7a28ed9d4b2539d479a52b75ece9d9e622e2c..ab4178d9a0241ea9616738e947acd6576a3fe62d 100644 (file)
--- a/src/common/dynlib.cpp
+++ b/src/common/dynlib.cpp
@@ -353,7 +353,11 @@ void *wxDynamicLibrary::GetSymbol(const wxString &name, bool *success) const
         symbol = 0;
 
 #elif defined(__WINDOWS__)
+#ifdef __WXWINCE__
+    symbol = (void*) ::GetProcAddress( m_handle, name );
+#else
     symbol = (void*) ::GetProcAddress( m_handle, name.mb_str() );
+#endif
 
 #else
 #error  "runtime shared lib support not implemented"

diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp
index 7772899d1bb6e28e4d502d1ca60ff2fd521f11ad..76363e5dc777248317811d8d8227c5e0641899d9 100644 (file)
--- a/src/msw/toplevel.cpp
+++ b/src/msw/toplevel.cpp
@@ -43,6 +43,12 @@
 #include "wx/msw/private.h"
 #include "wx/msw/winundef.h"
 
+// This can't be undefed in winundef.h or
+// there are further errors
+#if defined(__WXWINCE__) && defined(CreateDialog)
+#undef CreateDialog
+#endif
+
 #include "wx/display.h"
 
 #ifndef ICON_BIG

diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp
index fae0cb322d99df68f07c31f87105cdc6f7544b32..e3de12da518ca709c3f46560a091c463b98a7f02 100644 (file)
--- a/src/msw/utils.cpp
+++ b/src/msw/utils.cpp
@@ -144,7 +144,7 @@ bool wxGetHostName(wxChar *buf, int maxSize)
 // get full hostname (with domain name if possible)
 bool wxGetFullHostName(wxChar *buf, int maxSize)
 {
-#ifndef __WXMICROWIN__
+#if !defined( __WXMICROWIN__) && wxUSE_DYNAMIC_LOADER
     // TODO should use GetComputerNameEx() when available
 
     // we don't want to always link with Winsock DLL as we might not use it at

diff --git a/src/msw/wince/tbarwce.cpp b/src/msw/wince/tbarwce.cpp
index 22cd6ffe97d42c002f1e44e4e6f06f6c58904de9..491006ad379fdf432549821b73fdb51265dd2c1d 100644 (file)
--- a/src/msw/wince/tbarwce.cpp
+++ b/src/msw/wince/tbarwce.cpp
@@ -121,7 +121,7 @@
 // wxWin macros
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarBase)
+IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl)
 
 BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
     EVT_MOUSE_EVENTS(wxToolBar::OnMouseEvent)