X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1ed64378076af9e28d1c3f896d4b85bdc6aa1b2a..2952b4b9e438896370163a0a7026ad446062b8e6:/include/wx/msw/window.h diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h index 24dad15d5f..01232d1ac9 100644 --- a/include/wx/msw/window.h +++ b/include/wx/msw/window.h @@ -97,10 +97,6 @@ public: const wxFont *theFont = (const wxFont *) NULL) const; -#if wxUSE_MENUS_NATIVE - virtual bool DoPopupMenu( wxMenu *menu, int x, int y ); -#endif // wxUSE_MENUS_NATIVE - virtual void SetScrollbar( int orient, int pos, int thumbVisible, int range, bool refresh = true ); virtual void SetScrollPos( int orient, int pos, bool refresh = true ); @@ -141,6 +137,11 @@ public: virtual bool UnregisterHotKey(int hotkeyId); #endif // wxUSE_HOTKEY +#ifdef __POCKETPC__ + bool IsContextMenuEnabled() const { return m_contextMenuEnabled; } + void EnableContextMenu(bool enable = true) { m_contextMenuEnabled = enable; } +#endif + // window handle stuff // ------------------- @@ -303,6 +304,7 @@ public: bool HandleSysColorChange(); bool HandleDisplayChange(); bool HandleCaptureChanged(WXHWND gainedCapture); + virtual bool HandleSettingChange(WXWPARAM wParam, WXLPARAM lParam); bool HandleQueryEndSession(long logOff, bool *mayEnd); bool HandleEndSession(bool endSession, long logOff); @@ -403,6 +405,11 @@ public: virtual void OnInternalIdle(); protected: + +#if wxUSE_MENUS_NATIVE + virtual bool DoPopupMenu( wxMenu *menu, int x, int y ); +#endif // wxUSE_MENUS_NATIVE + // the window handle WXHWND m_hWnd; @@ -500,6 +507,10 @@ private: wxPoint m_pendingPosition; wxSize m_pendingSize; +#ifdef __POCKETPC__ + bool m_contextMenuEnabled; +#endif + DECLARE_DYNAMIC_CLASS(wxWindowMSW) DECLARE_NO_COPY_CLASS(wxWindowMSW) DECLARE_EVENT_TABLE()