X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5da0803c1534db8a410cdff616921175a8ddda77..4bf45c9ecafa14b167ef0c911a83cd5cc8fba4d2:/include/wx/msw/window.h?ds=sidebyside diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h index 45372805e6..68f84fae4a 100644 --- a/include/wx/msw/window.h +++ b/include/wx/msw/window.h @@ -28,18 +28,11 @@ // 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 // --------------------------------------------------------------------------- -// FIXME does anybody use those? they're unused by wxWindows... +// FIXME does anybody use those? they're unused by wxWidgets... enum { wxKEY_SHIFT = 1, @@ -140,33 +133,6 @@ public: wxDEPRECATED( void SetTransparent(bool t = TRUE) ); #endif // WXWIN_COMPATIBILITY_2_4 -#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 - #ifndef __WXUNIVERSAL__ // Native resource loading (implemented in src/msw/nativdlg.cpp) // FIXME: should they really be all virtual? @@ -197,6 +163,9 @@ public: void OnEraseBackground(wxEraseEvent& event); void OnPaint(wxPaintEvent& event); +#ifdef __WXWINCE__ + void OnInitDialog( wxInitDialogEvent& event ); +#endif public: // For implementation purposes - sometimes decorations make the client area @@ -210,7 +179,7 @@ public: WXFARPROC MSWGetOldWndProc() const { return m_oldWndProc; } void MSWSetOldWndProc(WXFARPROC proc) { m_oldWndProc = proc; } - // return TRUE if the window is of a standard (i.e. not wxWindows') class + // return TRUE if the window is of a standard (i.e. not wxWidgets') class // // to understand why does it work, look at SubclassWin() code and comments bool IsOfStandardClass() const { return m_oldWndProc != NULL; } @@ -221,21 +190,21 @@ public: // MSW only: TRUE if this control is part of the main control virtual bool ContainsHWND(WXHWND WXUNUSED(hWnd)) const { return FALSE; }; - // translate wxWindows style flags for this control into the Windows style + // translate wxWidgets style flags for this control into the Windows style // and optional extended style for the corresponding native control // // this is the function that should be overridden in the derived classes, // but you will mostly use MSWGetCreateWindowFlags() below virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const ; - // get the MSW window flags corresponding to wxWindows ones + // get the MSW window flags corresponding to wxWidgets ones // // the functions returns the flags (WS_XXX) directly and puts the ext // (WS_EX_XXX) flags into the provided pointer if not NULL WXDWORD MSWGetCreateWindowFlags(WXDWORD *exflags = NULL) const { return MSWGetStyle(GetWindowStyle(), exflags); } - // translate wxWindows coords into Windows ones suitable to be passed to + // translate wxWidgets coords into Windows ones suitable to be passed to // ::CreateWindow() // // returns TRUE if non default coords are returned, FALSE otherwise @@ -260,11 +229,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); @@ -336,7 +300,6 @@ public: 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, @@ -379,10 +342,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 @@ -408,11 +371,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); @@ -464,6 +422,9 @@ protected: virtual void DoCaptureMouse(); virtual void DoReleaseMouse(); + // has the window been frozen by Freeze()? + bool IsFrozen() const { return m_frozenness > 0; } + // move the window to the specified location and resize it: this is called // from both DoSetSize() and DoSetClientSize() and would usually just call // ::MoveWindow() except for composite controls which will want to arrange @@ -500,6 +461,9 @@ 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() @@ -522,7 +486,7 @@ inline void wxWindowMSW::SetTransparent(bool WXUNUSED(t)) { } // --------------------------------------------------------------------------- // 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 @@ -535,5 +499,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_