From e951b8e4e6c07fe5d5200b8cbf6148e7317aa0e5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Wed, 15 Dec 2004 12:22:51 +0000 Subject: [PATCH] Move unused values into 2.4 compatibility. Source cleaning. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31018 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/msw/window.h | 4 +++- include/wx/os2/window.h | 32 +++++++++++++++-------------- include/wx/palmos/window.h | 42 ++++++++++++++++++++------------------ 3 files changed, 42 insertions(+), 36 deletions(-) diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h index 0aae98ca6d..4469b413f4 100644 --- a/include/wx/msw/window.h +++ b/include/wx/msw/window.h @@ -32,12 +32,14 @@ // constants // --------------------------------------------------------------------------- -// FIXME does anybody use those? they're unused by wxWidgets... +#if WXWIN_COMPATIBILITY_2_4 +// they're unused by wxWidgets... enum { wxKEY_SHIFT = 1, wxKEY_CTRL = 2 }; +#endif // --------------------------------------------------------------------------- // wxWindow declaration for MSW diff --git a/include/wx/os2/window.h b/include/wx/os2/window.h index 925b345a8c..f18fc3eeaa 100644 --- a/include/wx/os2/window.h +++ b/include/wx/os2/window.h @@ -40,12 +40,14 @@ class WXDLLEXPORT wxButton; // constants // --------------------------------------------------------------------------- -// FIXME does anybody use those? they're unused by wxWidgets... +#if WXWIN_COMPATIBILITY_2_4 +// they're unused by wxWidgets... enum { wxKEY_SHIFT = 1, wxKEY_CTRL = 2 }; +#endif // --------------------------------------------------------------------------- // wxWindow declaration for OS/2 PM @@ -92,15 +94,15 @@ public: virtual wxString GetTitle(void) const; virtual void Raise(void); virtual void Lower(void); - virtual bool Show(bool bShow = TRUE); - virtual bool Enable(bool bEnable = TRUE); + virtual bool Show(bool bShow = true); + virtual bool Enable(bool bEnable = true); virtual void SetFocus(void); virtual void SetFocusFromKbd(void); virtual bool Reparent(wxWindow* pNewParent); virtual void WarpPointer( int x ,int y ); - virtual void Refresh( bool bEraseBackground = TRUE + virtual void Refresh( bool bEraseBackground = true ,const wxRect* pRect = (const wxRect *)NULL ); virtual void Freeze(void); @@ -129,11 +131,11 @@ public: ,int nPos ,int nThumbVisible ,int nRange - ,bool bRefresh = TRUE + ,bool bRefresh = true ); virtual void SetScrollPos( int nOrient ,int nPos - ,bool bRefresh = TRUE + ,bool bRefresh = true ); virtual int GetScrollPos(int nOrient) const; virtual int GetScrollThumb(int nOrient) const; @@ -176,7 +178,7 @@ public: virtual WXWidget GetHandle(void) const { return GetHWND(); } bool GetUseCtl3D(void) const { return m_bUseCtl3D; } bool GetTransparentBackground(void) const { return m_bBackgroundTransparent; } - void SetTransparent(bool bT = TRUE) { m_bBackgroundTransparent = bT; } + void SetTransparent(bool bT = true) { m_bBackgroundTransparent = bT; } // event handlers // -------------- @@ -197,22 +199,22 @@ public: WXFARPROC OS2GetOldWndProc(void) const { return m_fnOldWndProc; } void OS2SetOldWndProc(WXFARPROC fnProc) { m_fnOldWndProc = fnProc; } // - // Return TRUE if the window is of a standard (i.e. not wxWidgets') class + // Return true if the window is of a standard (i.e. not wxWidgets') class // bool IsOfStandardClass(void) const { return m_fnOldWndProc != NULL; } wxWindow* FindItem(long lId) const; wxWindow* FindItemByHWND( WXHWND hWnd - ,bool bControlOnly = FALSE + ,bool bControlOnly = false ) const; // Make a Windows extended style from the given wxWidgets window style ?? applicable to OS/2?? static WXDWORD MakeExtendedStyle( long lStyle - ,bool bEliminateBorders = TRUE + ,bool bEliminateBorders = true ); - // PM only: TRUE if this control is part of the main control - virtual bool ContainsHWND(WXHWND WXUNUSED(hWnd)) const { return FALSE; }; + // PM only: true if this control is part of the main control + virtual bool ContainsHWND(WXHWND WXUNUSED(hWnd)) const { return false; }; // translate wxWidgets style flags for this control into the PM style // and optional extended style for the corresponding native control @@ -234,7 +236,7 @@ public: // get the HWND to be used as parent of this window with CreateWindow() virtual WXHWND OS2GetParent(void) const; - // returns TRUE if the window has been created + // returns true if the window has been created bool OS2Create( PSZ zClass ,const char* zTitle ,WXDWORD dwStyle @@ -293,7 +295,7 @@ public: // ------------------------------------------------------------------------ // internal handlers for OS2 messages: all handlers return a boolen value: - // TRUE means that the handler processed the event and FALSE that it didn't + // true means that the handler processed the event and false that it didn't // ------------------------------------------------------------------------ // there are several cases where we have virtual functions for PM @@ -369,7 +371,7 @@ public: ); bool HandleChar( WXWPARAM wParam ,WXLPARAM lParam - ,bool bIsASCII = FALSE + ,bool bIsASCII = false ); bool HandleKeyDown( WXWPARAM wParam ,WXLPARAM lParam diff --git a/include/wx/palmos/window.h b/include/wx/palmos/window.h index b19904f5f0..d082d31ad1 100644 --- a/include/wx/palmos/window.h +++ b/include/wx/palmos/window.h @@ -4,7 +4,7 @@ // Author: William Osborne // Modified by: // Created: 10/13/04 -// RCS-ID: $Id: +// RCS-ID: $Id: // Copyright: (c) William Osborne // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -36,12 +36,14 @@ // constants // --------------------------------------------------------------------------- -// FIXME does anybody use those? they're unused by wxWidgets... +#if WXWIN_COMPATIBILITY_2_4 +// they're unused by wxWidgets... enum { wxKEY_SHIFT = 1, wxKEY_CTRL = 2 }; +#endif // --------------------------------------------------------------------------- // wxWindow declaration for Palm @@ -79,8 +81,8 @@ public: virtual void Raise(); virtual void Lower(); - virtual bool Show( bool show = TRUE ); - virtual bool Enable( bool enable = TRUE ); + virtual bool Show( bool show = true ); + virtual bool Enable( bool enable = true ); virtual void SetFocus(); virtual void SetFocusFromKbd(); @@ -89,7 +91,7 @@ public: virtual void WarpPointer(int x, int y); - virtual void Refresh( bool eraseBackground = TRUE, + virtual void Refresh( bool eraseBackground = true, const wxRect *rect = (const wxRect *) NULL ); virtual void Update(); virtual void Freeze(); @@ -113,8 +115,8 @@ public: #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 ); + int range, bool refresh = true ); + virtual void SetScrollPos( int orient, int pos, bool refresh = true ); virtual int GetScrollPos( int orient ) const; virtual int GetScrollThumb( int orient ) const; virtual int GetScrollRange( int orient ) const; @@ -134,7 +136,7 @@ public: #if WXWIN_COMPATIBILITY_2_4 wxDEPRECATED( bool GetUseCtl3D() const ); wxDEPRECATED( bool GetTransparentBackground() const ); - wxDEPRECATED( void SetTransparent(bool t = TRUE) ); + wxDEPRECATED( void SetTransparent(bool t = true) ); #endif // WXWIN_COMPATIBILITY_2_4 #ifndef __WXUNIVERSAL__ @@ -180,16 +182,16 @@ public: WXFARPROC PalmGetOldWndProc() const { return m_oldWndProc; } void PalmSetOldWndProc(WXFARPROC proc) { m_oldWndProc = proc; } - // return TRUE if the window is of a standard (i.e. not wxWidgets') 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; } wxWindow *FindItem(long id) const; - wxWindow *FindItemByHWND(WXHWND hWnd, bool controlOnly = FALSE) const; + wxWindow *FindItemByHWND(WXHWND hWnd, bool controlOnly = false) const; - // Palm only: TRUE if this control is part of the main control - virtual bool ContainsHWND(WXHWND WXUNUSED(hWnd)) const { return FALSE; }; + // Palm only: true if this control is part of the main control + virtual bool ContainsHWND(WXHWND WXUNUSED(hWnd)) const { return false; }; // translate wxWidgets style flags for this control into the Windows style // and optional extended style for the corresponding native control @@ -208,7 +210,7 @@ public: // translate wxWidgets coords into Windows ones suitable to be passed to // ::CreateWindow() // - // returns TRUE if non default coords are returned, FALSE otherwise + // returns true if non default coords are returned, false otherwise bool PalmGetCreateWindowCoords(const wxPoint& pos, const wxSize& size, int& x, int& y, @@ -220,7 +222,7 @@ public: // creates the window of specified Windows class with given style, extended // style, title and geometry (default values // - // returns TRUE if the window has been created, FALSE if creation failed + // returns true if the window has been created, false if creation failed bool PalmCreate(const wxChar *wclass, const wxChar *title = NULL, const wxPoint& pos = wxDefaultPosition, @@ -260,7 +262,7 @@ public: // ------------------------------------------------------------------------ // internal handlers for Palm messages: all handlers return a boolean value: - // TRUE means that the handler processed the event and FALSE that it didn't + // true means that the handler processed the event and false that it didn't // ------------------------------------------------------------------------ // there are several cases where we have virtual functions for Windows @@ -328,7 +330,7 @@ public: bool HandleMouseMove(int x, int y, WXUINT flags); bool HandleMouseWheel(WXWPARAM wParam, WXLPARAM lParam); - bool HandleChar(WXWPARAM wParam, WXLPARAM lParam, bool isASCII = FALSE); + bool HandleChar(WXWPARAM wParam, WXLPARAM lParam, bool isASCII = false); bool HandleKeyDown(WXWPARAM wParam, WXLPARAM lParam); bool HandleKeyUp(WXWPARAM wParam, WXLPARAM lParam); #if wxUSE_ACCEL @@ -350,14 +352,14 @@ public: // message processing helpers - // return FALSE if the message shouldn't be translated/preprocessed but + // return false if the message shouldn't be translated/preprocessed but // dispatched normally virtual bool PalmShouldPreProcessMessage(WXMSG* pMsg); - // return TRUE if the message was preprocessed and shouldn't be dispatched + // return true if the message was preprocessed and shouldn't be dispatched virtual bool PalmProcessMessage(WXMSG* pMsg); - // return TRUE if the message was translated and shouldn't be dispatched + // return true if the message was translated and shouldn't be dispatched virtual bool PalmTranslateMessage(WXMSG* pMsg); // called when the window is about to be destroyed @@ -389,7 +391,7 @@ protected: // the window handle WXHWND m_hWnd; FormType *FrameForm; - + FormType *GetFormPtr(); void SetFormPtr(FormType *FormPtr); -- 2.45.2