Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxUniv compilation fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12666 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-11-25 00:23:19 +00:00
parent 5836c9080b
commit d2d14464a5
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/wx/univ/setup.h
View File

@@ -13,8 +13,9 @@
#define _WX_UNIV_SETUP_H_ #define _WX_UNIV_SETUP_H_
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// undef everything // not all ports implement everything...
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#if defined(__WXMAC__) #if defined(__WXMAC__)
#define wxUSE_GUI 1 #define wxUSE_GUI 1
@@ -329,7 +330,7 @@
#define wxUSE_REGEX 0 #define wxUSE_REGEX 0
#define wxUSE_STATUSBAR 1 #define wxUSE_STATUSBAR 1
#else #else // !Mac, !OS2
#define wxUSE_GUI 1 #define wxUSE_GUI 1
#define WXWIN_COMPATIBILITY 0 #define WXWIN_COMPATIBILITY 0
@@ -372,6 +373,7 @@
#define wxUSE_FILE 1 #define wxUSE_FILE 1
#define wxUSE_FFILE 1 #define wxUSE_FFILE 1
#define wxUSE_TEXTFILE 0 #define wxUSE_TEXTFILE 0
#define wxUSE_TEXTBUFFER 0
#define wxUSE_INTL 0 #define wxUSE_INTL 0
#define wxUSE_MENUS 1 #define wxUSE_MENUS 1
#define wxUSE_TOOLBAR 0 #define wxUSE_TOOLBAR 0
@@ -437,6 +439,7 @@
#define wxUSE_SPLITTER 1 #define wxUSE_SPLITTER 1
#define wxUSE_TAB_DIALOG 0 #define wxUSE_TAB_DIALOG 0
#define wxUSE_SPLASH 1
#define wxUSE_JOYSTICK 0 #define wxUSE_JOYSTICK 0
#define wxUSE_METAFILE 0 #define wxUSE_METAFILE 0
#define wxUSE_ENH_METAFILE 0 #define wxUSE_ENH_METAFILE 0

2
src/msw/window.cpp
View File

@@ -2618,7 +2618,7 @@ void wxAssociateWinWithHandle(HWND hWnd, wxWindowMSW *win)
#endif // __WXDEBUG__ #endif // __WXDEBUG__
if (!oldWin) if (!oldWin)
{ {
wxWinHandleHash->Put((long)hWnd, win); wxWinHandleHash->Put((long)hWnd, (wxWindow *)win);
} }
} }