X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bfc6fde4b1dd5bfd8ae22839ff9a69cf24eb9120..06c545a70377ea25f2263b2d2fa432db67d8b619:/include/wx/msw/window.h diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h index 3e2ac99f30..3a5e837044 100644 --- a/include/wx/msw/window.h +++ b/include/wx/msw/window.h @@ -78,7 +78,7 @@ class WXDLLEXPORT wxResourceTable; class WXDLLEXPORT wxItemResource; #endif -WXDLLEXPORT_DATA(extern const char*) wxPanelNameStr; +WXDLLEXPORT_DATA(extern const wxChar*) wxPanelNameStr; WXDLLEXPORT_DATA(extern const wxSize) wxDefaultSize; WXDLLEXPORT_DATA(extern const wxPoint) wxDefaultPosition; @@ -667,8 +667,8 @@ public: // These return TRUE if an event handler was found, FALSE otherwise (not processed) virtual bool MSWOnChar(WXWORD wParam, WXLPARAM lParam, bool isASCII = FALSE); - virtual bool MSWOnKeyDown(WXWORD wParam, WXLPARAM lParam, bool isASCII = FALSE); - virtual bool MSWOnKeyUp(WXWORD wParam, WXLPARAM lParam, bool isASCII = FALSE); + virtual bool MSWOnKeyDown(WXWORD wParam, WXLPARAM lParam); + virtual bool MSWOnKeyUp(WXWORD wParam, WXLPARAM lParam); virtual bool MSWOnActivate(int flag, bool minimized, WXHWND activate); virtual long MSWOnMDIActivate(long flag, WXHWND activate, WXHWND deactivate); @@ -874,7 +874,7 @@ inline bool wxWindow::IsBeingDeleted() { return m_isBeingDeleted; } // Window specific (so far) WXDLLEXPORT wxWindow* wxGetActiveWindow(); -WXDLLEXPORT_DATA(extern wxList) wxTopLevelWindows; +WXDLLEXPORT_DATA(extern wxWindowList) wxTopLevelWindows; WXDLLEXPORT int wxCharCodeMSWToWX(int keySym); WXDLLEXPORT int wxCharCodeWXToMSW(int id, bool *IsVirtual);