X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4055ed8281971e3d35bf04177193c27043d42ed1..9a727a3bb8d1ea77ef561b6fa4af05c7b5602595:/include/wx/palmos/window.h diff --git a/include/wx/palmos/window.h b/include/wx/palmos/window.h index 230bcbdff2..8c1f1dd31e 100644 --- a/include/wx/palmos/window.h +++ b/include/wx/palmos/window.h @@ -1,11 +1,11 @@ ///////////////////////////////////////////////////////////////////////////// // Name: wx/palmos/window.h // Purpose: wxWindow class -// Author: William Osborne -// Modified by: +// Author: William Osborne - minimal working wxPalmOS port +// Modified by: Wlodzimierz ABX Skiba - more than minimal functionality // Created: 10/13/04 -// RCS-ID: $Id: -// Copyright: (c) William Osborne +// RCS-ID: $Id$ +// Copyright: (c) William Osborne, Wlodzimierz Skiba // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -27,19 +27,6 @@ // a better solution should be found later... #define wxUSE_MOUSEEVENT_HACK 0 -// --------------------------------------------------------------------------- -// constants -// --------------------------------------------------------------------------- - -#if WXWIN_COMPATIBILITY_2_4 -// they're unused by wxWidgets... -enum -{ - wxKEY_SHIFT = 1, - wxKEY_CTRL = 2 -}; -#endif - // --------------------------------------------------------------------------- // wxWindow declaration for Palm // --------------------------------------------------------------------------- @@ -128,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? @@ -271,11 +252,6 @@ public: virtual bool PalmOnScroll(int orientation, WXWORD nSBCode, WXWORD pos, WXHWND control); - // child control notifications -#ifdef __WIN95__ - virtual bool PalmOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result); -#endif // __WIN95__ - // owner-drawn controls need to process these messages virtual bool PalmOnDrawItem(int id, WXDRAWITEMSTRUCT *item); virtual bool PalmOnMeasureItem(int id, WXMEASUREITEMSTRUCT *item); @@ -450,10 +426,6 @@ private: bool HandleMoving(wxRect& rect); bool HandleJoystickEvent(WXUINT msg, int x, int y, WXUINT flags); -#ifdef __WIN95__ - bool HandleNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result); -#endif // __WIN95__ - // list of disabled children before last call to our Disable() wxWindowList *m_childrenDisabled; @@ -465,18 +437,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 // --------------------------------------------------------------------------- @@ -504,11 +464,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;