From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 25 Nov 2001 00:23:19 +0000 (+0000)
Subject: wxUniv compilation fixes
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/d2d14464a55ec9bc47dbaee6f1f4488ad525334a

wxUniv compilation fixes


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

diff --git a/include/wx/univ/setup.h b/include/wx/univ/setup.h
index 197d646c42..8d42edaf18 100644
--- a/include/wx/univ/setup.h
+++ b/include/wx/univ/setup.h
@@ -13,8 +13,9 @@
 #define _WX_UNIV_SETUP_H_
 
 // ----------------------------------------------------------------------------
-// undef everything
+// not all ports implement everything...
 // ----------------------------------------------------------------------------
+
 #if defined(__WXMAC__)
 
 #define wxUSE_GUI            1
@@ -329,7 +330,7 @@
 #define wxUSE_REGEX         0
 #define wxUSE_STATUSBAR     1
 
-#else
+#else // !Mac, !OS2
 
 #define wxUSE_GUI            1
 #define WXWIN_COMPATIBILITY  0
@@ -372,6 +373,7 @@
 #define wxUSE_FILE                1
 #define wxUSE_FFILE               1
 #define wxUSE_TEXTFILE            0
+#define wxUSE_TEXTBUFFER          0
 #define wxUSE_INTL                0
 #define wxUSE_MENUS 1
 #define wxUSE_TOOLBAR 0
@@ -437,6 +439,7 @@
 #define wxUSE_SPLITTER     1
 #define wxUSE_TAB_DIALOG   0
 
+#define wxUSE_SPLASH 1
 #define wxUSE_JOYSTICK 0
 #define wxUSE_METAFILE              0
 #define wxUSE_ENH_METAFILE          0
diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 10d88547e1..775c7bb684 100644
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -2618,7 +2618,7 @@ void wxAssociateWinWithHandle(HWND hWnd, wxWindowMSW *win)
 #endif // __WXDEBUG__
     if (!oldWin)
     {
-        wxWinHandleHash->Put((long)hWnd, win);
+        wxWinHandleHash->Put((long)hWnd, (wxWindow *)win);
     }
 }