TWIN32 compatibility added; wxMotif uses wxGTK's wxPostScriptDC;
wxByte replaces byte (can conflict with windows.h) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1428 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -61,9 +61,11 @@
|
||||
#include <windowsx.h>
|
||||
#endif
|
||||
|
||||
#ifndef __TWIN32__
|
||||
#ifdef __GNUWIN32__
|
||||
#include <wx/msw/gnuwin32/extra.h>
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef GetCharWidth
|
||||
#undef GetCharWidth
|
||||
@@ -1420,7 +1422,7 @@ void wxAssociateWinWithHandle(HWND hWnd, wxWindow *win)
|
||||
{
|
||||
// adding NULL hWnd is (first) surely a result of an error and
|
||||
// (secondly) breaks menu command processing
|
||||
wxCHECK_RET( hWnd != NULL, "attempt to add a NULL hWnd to window list" );
|
||||
wxCHECK_RET( hWnd != (HWND) NULL, "attempt to add a NULL hWnd to window list" );
|
||||
|
||||
if ( !wxWinHandleList->Find((long)hWnd) )
|
||||
wxWinHandleList->Append((long)hWnd, win);
|
||||
@@ -2963,7 +2965,7 @@ void wxSetKeyboardHook(bool doIt)
|
||||
{
|
||||
wxTheKeyboardHookProc = MakeProcInstance((FARPROC) wxKeyboardHook, wxGetInstance());
|
||||
wxTheKeyboardHook = SetWindowsHookEx(WH_KEYBOARD, (HOOKPROC) wxTheKeyboardHookProc, wxGetInstance(),
|
||||
#ifdef __WIN32__
|
||||
#if defined(__WIN32__) && !defined(__TWIN32__)
|
||||
GetCurrentThreadId());
|
||||
// (DWORD)GetCurrentProcess()); // This is another possibility. Which is right?
|
||||
#else
|
||||
|
Reference in New Issue
Block a user