X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/078cf5cb756c4f4113d7acf04ebd6a2535ef75b3..6f02a879ed7efc5fcf6328ff47a1352ec82812b7:/src/msw/penwin.cpp diff --git a/src/msw/penwin.cpp b/src/msw/penwin.cpp index 8a32c9f708..2295b2665c 100644 --- a/src/msw/penwin.cpp +++ b/src/msw/penwin.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: penwin.cpp +// Name: src/msw/penwin.cpp // Purpose: PenWindows code // Author: Julian Smart // Modified by: @@ -9,10 +9,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -21,8 +17,7 @@ #endif #ifndef WX_PRECOMP -#include "wx/setup.h" -#include "wx/window.h" + #include "wx/window.h" #endif #include "wx/msw/private.h" @@ -62,7 +57,7 @@ void wxEnablePenAppHooks (bool hook) /////////////////////////////////////////////////////////////////////// // If running on a Pen Windows system, register this app so all // EDIT controls in dialogs are replaced by HEDIT controls. - if ((g_hPenWin = (HANDLE)GetSystemMetrics (SM_PENWINDOWS)) != (HANDLE) NULL) + if ((g_hPenWin = (HANDLE)::GetSystemMetrics (SM_PENWINDOWS)) != (HANDLE) NULL) { // We do this fancy GetProcAddress simply because we don't // know if we're running Pen Windows. @@ -97,7 +92,7 @@ void wxRegisterPenWin(void) // (Notice the CONTROL statement in the RC file is "EDIT", // RegisterPenApp will automatically change that control to // an HEDIT. - if ((g_hPenWin = (HANDLE)GetSystemMetrics(SM_PENWINDOWS)) != (HANDLE)NULL) { + if ((g_hPenWin = (HANDLE)::GetSystemMetrics(SM_PENWINDOWS)) != (HANDLE)NULL) { // We do this fancy GetProcAddress simply because we don't // know if we're running Pen Windows. if ( (RegPenApp = (void (CALLBACK *)(WORD, BOOL))GetProcAddress(g_hPenWin, "RegisterPenApp"))!= NULL) @@ -117,4 +112,3 @@ void wxCleanUpPenWin(void) } #endif } -