X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fe3d9123c6968b452a95133c635069d6f7ae8ea5..571d14b2621325840e465e1e55be9f5a362a5dbd:/include/wx/msw/window.h diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h index a34ac1e2dd..d40b27c79d 100644 --- a/include/wx/msw/window.h +++ b/include/wx/msw/window.h @@ -17,7 +17,7 @@ // headers // --------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "window.h" #endif @@ -28,13 +28,6 @@ // a better solution should be found later... #define wxUSE_MOUSEEVENT_HACK 0 -#include "wx/hash.h" - -// pseudo-template HWND <-> wxWindow hash table -WX_DECLARE_HASH(wxWindow, wxWindowList, wxWinHashTable); - -extern wxWinHashTable *wxWinHandleHash; - // --------------------------------------------------------------------------- // constants // --------------------------------------------------------------------------- @@ -95,7 +88,6 @@ public: virtual void Refresh( bool eraseBackground = TRUE, const wxRect *rect = (const wxRect *) NULL ); virtual void Update(); - virtual void Clear(); virtual void Freeze(); virtual void Thaw(); @@ -135,32 +127,11 @@ public: // Accept files for dragging virtual void DragAcceptFiles(bool accept); -#if WXWIN_COMPATIBILITY - // Set/get scroll attributes - virtual void SetScrollRange(int orient, int range, bool refresh = TRUE); - virtual void SetScrollPage(int orient, int page, bool refresh = TRUE); - virtual int OldGetScrollRange(int orient) const; - virtual int GetScrollPage(int orient) const; - - // event handlers - // Handle a control command - virtual void OnCommand(wxWindow& win, wxCommandEvent& event); - - // Override to define new behaviour for default action (e.g. double - // clicking on a listbox) - virtual void OnDefaultAction(wxControl * WXUNUSED(initiatingItem)) { } -#endif // WXWIN_COMPATIBILITY - -#if wxUSE_CARET && WXWIN_COMPATIBILITY - // caret manipulation (old MSW only functions, see wxCaret class for the - // new API) - void CreateCaret(int w, int h); - void CreateCaret(const wxBitmap *bitmap); - void DestroyCaret(); - void ShowCaret(bool show); - void SetCaretPos(int x, int y); - void GetCaretPos(int *x, int *y) const; -#endif // wxUSE_CARET +#if WXWIN_COMPATIBILITY_2_4 + wxDEPRECATED( bool GetUseCtl3D() const ); + wxDEPRECATED( bool GetTransparentBackground() const ); + wxDEPRECATED( void SetTransparent(bool t = TRUE) ); +#endif // WXWIN_COMPATIBILITY_2_4 #ifndef __WXUNIVERSAL__ // Native resource loading (implemented in src/msw/nativdlg.cpp) @@ -171,6 +142,12 @@ public: wxWindow* GetWindowChild(wxWindowID id); #endif // __WXUNIVERSAL__ +#if wxUSE_HOTKEY + // install and deinstall a system wide hotkey + virtual bool RegisterHotKey(int hotkeyId, int modifiers, int keycode); + virtual bool UnregisterHotKey(int hotkeyId); +#endif // wxUSE_HOTKEY + // implementation from now on // -------------------------- @@ -181,15 +158,10 @@ public: void SetHWND(WXHWND hWnd) { m_hWnd = hWnd; } virtual WXWidget GetHandle() const { return GetHWND(); } - bool GetUseCtl3D() const { return m_useCtl3D; } - bool GetTransparentBackground() const { return m_backgroundTransparent; } - void SetTransparent(bool t = TRUE) { m_backgroundTransparent = t; } - // event handlers // -------------- void OnEraseBackground(wxEraseEvent& event); - void OnIdle(wxIdleEvent& event); void OnPaint(wxPaintEvent& event); public: @@ -254,11 +226,6 @@ public: virtual bool MSWCommand(WXUINT param, WXWORD id); -#if WXWIN_COMPATIBILITY - wxObject *GetChild(int number) const; - virtual void MSWDeviceToLogical(float *x, float *y) const; -#endif // WXWIN_COMPATIBILITY - #ifndef __WXUNIVERSAL__ // Create an appropriate wxWindow from a HWND virtual wxWindow* CreateWindowFromHWND(wxWindow* parent, WXHWND hWnd); @@ -323,13 +290,13 @@ public: bool HandleMinimize(); bool HandleMaximize(); bool HandleSize(int x, int y, WXUINT flag); + bool HandleSizing(wxRect& rect); bool HandleGetMinMaxInfo(void *mmInfo); bool HandleShow(bool show, int status); bool HandleActivate(int flag, bool minimized, WXHWND activate); bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control); - bool HandleSysCommand(WXWPARAM wParam, WXLPARAM lParam); bool HandleCtlColor(WXHBRUSH *hBrush, WXHDC hdc, @@ -360,6 +327,9 @@ public: bool HandleChar(WXWPARAM wParam, WXLPARAM lParam, bool isASCII = FALSE); bool HandleKeyDown(WXWPARAM wParam, WXLPARAM lParam); bool HandleKeyUp(WXWPARAM wParam, WXLPARAM lParam); +#if wxUSE_ACCEL + bool HandleHotKey(WXWPARAM wParam, WXLPARAM lParam); +#endif #ifdef __WIN32__ int HandleMenuChar(int chAccel, WXLPARAM lParam); #endif @@ -369,10 +339,10 @@ public: bool HandleSetCursor(WXHWND hWnd, short nHitTest, int mouseMsg); // Window procedure - virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); + virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); // Calls an appropriate default window procedure - virtual long MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); + virtual WXLRESULT MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); // message processing helpers @@ -398,11 +368,6 @@ public: WXWPARAM wParam, WXLPARAM lParam); -#if WXWIN_COMPATIBILITY - void SetShowing(bool show) { (void)Show(show); } - bool IsUserEnabled() const { return IsEnabled(); } -#endif // WXWIN_COMPATIBILITY - // Responds to colour changes: passes event on to children. void OnSysColourChanged(wxSysColourChangedEvent& event); @@ -412,6 +377,10 @@ public: // check if mouse is in the window bool IsMouseInWindow() const; + // virtual function for implementing internal idle + // behaviour + virtual void OnInternalIdle() ; + protected: // the window handle WXHWND m_hWnd; @@ -420,8 +389,6 @@ protected: WXFARPROC m_oldWndProc; // additional (MSW specific) flags - bool m_useCtl3D:1; // Using CTL3D for this control - bool m_backgroundTransparent:1; bool m_mouseInWindow:1; bool m_lastKeydownProcessed:1; @@ -478,6 +445,7 @@ private: // the (non-virtual) handlers for the events bool HandleMove(int x, int y); + bool HandleMoving(wxRect& rect); bool HandleJoystickEvent(WXUINT msg, int x, int y, WXUINT flags); #ifdef __WIN95__ @@ -487,17 +455,32 @@ private: // list of disabled children before last call to our Disable() wxWindowList *m_childrenDisabled; + // number of calls to Freeze() minus number of calls to Thaw() + unsigned int m_frozenness; + DECLARE_DYNAMIC_CLASS(wxWindowMSW) DECLARE_NO_COPY_CLASS(wxWindowMSW) DECLARE_EVENT_TABLE() }; +// ---------------------------------------------------------------------------- +// inline functions +// ---------------------------------------------------------------------------- + +#if WXWIN_COMPATIBILITY_2_4 + +inline bool wxWindowMSW::GetUseCtl3D() const { return false; } +inline bool wxWindowMSW::GetTransparentBackground() const { return false; } +inline void wxWindowMSW::SetTransparent(bool WXUNUSED(t)) { } + +#endif // WXWIN_COMPATIBILITY_2_4 + // --------------------------------------------------------------------------- // global functions // --------------------------------------------------------------------------- // kbd code translation -WXDLLEXPORT int wxCharCodeMSWToWX(int keySym); +WXDLLEXPORT int wxCharCodeMSWToWX(int keySym, WXLPARAM lParam = 0); WXDLLEXPORT int wxCharCodeWXToMSW(int id, bool *IsVirtual); // window creation helper class: before creating a new HWND, instantiate an @@ -510,5 +493,22 @@ public: ~wxWindowCreationHook(); }; +// ---------------------------------------------------------------------------- +// global objects +// ---------------------------------------------------------------------------- + +// notice that this hash must be defined after wxWindow declaration as it +// needs to "see" its dtor and not just forward declaration +#include "wx/hash.h" + +// pseudo-template HWND <-> wxWindow hash table +#if WXWIN_COMPATIBILITY_2_4 +WX_DECLARE_HASH(wxWindow, wxWindowList, wxWinHashTable); +#else +WX_DECLARE_HASH(wxWindowMSW, wxWindowList, wxWinHashTable); +#endif + +extern wxWinHashTable *wxWinHandleHash; + #endif // _WX_WINDOW_H_