X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ffecfa5aeb540b54914739dbb8603edbbd4c00a0..29c8694822a192934278ba0f98eaf437024c0278:/include/wx/palmos/window.h diff --git a/include/wx/palmos/window.h b/include/wx/palmos/window.h index b19904f5f0..a00a06e6e7 100644 --- a/include/wx/palmos/window.h +++ b/include/wx/palmos/window.h @@ -1,10 +1,10 @@ ///////////////////////////////////////////////////////////////////////////// // Name: wx/palmos/window.h // Purpose: wxWindow class -// Author: William Osborne +// Author: William Osborne - minimal working wxPalmOS port // Modified by: // Created: 10/13/04 -// RCS-ID: $Id: +// RCS-ID: $Id$ // Copyright: (c) William Osborne // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -12,11 +12,6 @@ #ifndef _WX_WINDOW_H_ #define _WX_WINDOW_H_ -#ifdef __PALMOS__ - #include -#endif - - // --------------------------------------------------------------------------- // headers // --------------------------------------------------------------------------- @@ -32,17 +27,6 @@ // a better solution should be found later... #define wxUSE_MOUSEEVENT_HACK 0 -// --------------------------------------------------------------------------- -// constants -// --------------------------------------------------------------------------- - -// FIXME does anybody use those? they're unused by wxWidgets... -enum -{ - wxKEY_SHIFT = 1, - wxKEY_CTRL = 2 -}; - // --------------------------------------------------------------------------- // wxWindow declaration for Palm // --------------------------------------------------------------------------- @@ -79,8 +63,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 +73,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 +97,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; @@ -131,12 +115,6 @@ public: // Accept files for dragging virtual void DragAcceptFiles(bool accept); -#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/Palm/nativdlg.cpp) // FIXME: should they really be all virtual? @@ -180,16 +158,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 +186,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 +198,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 +238,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,15 +306,12 @@ 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 bool HandleHotKey(WXWPARAM wParam, WXLPARAM lParam); #endif -#ifdef __WIN32__ - int HandleMenuChar(int chAccel, WXLPARAM lParam); -#endif bool HandleQueryDragIcon(WXHICON *hIcon); @@ -350,14 +325,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 +364,7 @@ protected: // the window handle WXHWND m_hWnd; FormType *FrameForm; - + FormType *GetFormPtr(); void SetFormPtr(FormType *FormPtr); @@ -471,18 +446,6 @@ private: DECLARE_EVENT_TABLE() }; -// ---------------------------------------------------------------------------- -// inline functions -// ---------------------------------------------------------------------------- - -#if WXWIN_COMPATIBILITY_2_4 - -inline bool wxWindowPalm::GetUseCtl3D() const { return false; } -inline bool wxWindowPalm::GetTransparentBackground() const { return false; } -inline void wxWindowPalm::SetTransparent(bool WXUNUSED(t)) { } - -#endif // WXWIN_COMPATIBILITY_2_4 - // --------------------------------------------------------------------------- // global functions // --------------------------------------------------------------------------- @@ -510,11 +473,7 @@ public: #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(wxWindowPalm, wxWindowList, wxWinHashTable); -#endif extern wxWinHashTable *wxWinHandleHash;