added wxDP_SPIN/DROPDOWN styles (only Win32 native version implements the former)

[wxWidgets.git] / include / wx / palmos / window.h

diff --git a/include/wx/palmos/window.h b/include/wx/palmos/window.h
index d082d31ad13228e9b764eb7e49a6370a8194aa40..a00a06e6e7a8cbddf63a4d28b57963e38c7ccc1c 100644 (file)
--- a/include/wx/palmos/window.h
+++ b/include/wx/palmos/window.h
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/palmos/window.h
 // Purpose:     wxWindow class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/palmos/window.h
 // Purpose:     wxWindow class

-// Author:      William Osborne
+// Author:      William Osborne - minimal working wxPalmOS port

 // Modified by:
 // Created:     10/13/04
 // Modified by:
 // Created:     10/13/04

-// RCS-ID:      $Id:
+// RCS-ID:      $Id$

 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -12,11 +12,6 @@
 #ifndef _WX_WINDOW_H_
 #define _WX_WINDOW_H_
 
 #ifndef _WX_WINDOW_H_
 #define _WX_WINDOW_H_
 

-#ifdef __PALMOS__
-    #include <PalmOS.h>
-#endif
-
-

 // ---------------------------------------------------------------------------
 // headers
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // headers
 // ---------------------------------------------------------------------------


@@ -32,19 +27,6 @@
 // a better solution should be found later...
 #define wxUSE_MOUSEEVENT_HACK 0
 
 // 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
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // wxWindow declaration for Palm
 // ---------------------------------------------------------------------------


@@ -133,12 +115,6 @@ public:
     // Accept files for dragging
     virtual void DragAcceptFiles(bool accept);
 
     // 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?
 #ifndef __WXUNIVERSAL__
     // Native resource loading (implemented in src/Palm/nativdlg.cpp)
     // FIXME: should they really be all virtual?


@@ -336,9 +312,6 @@ public:
 #if wxUSE_ACCEL
     bool HandleHotKey(WXWPARAM wParam, WXLPARAM lParam);
 #endif
 #if wxUSE_ACCEL
     bool HandleHotKey(WXWPARAM wParam, WXLPARAM lParam);
 #endif

-#ifdef __WIN32__
-    int HandleMenuChar(int chAccel, WXLPARAM lParam);
-#endif

 
     bool HandleQueryDragIcon(WXHICON *hIcon);
 
 
     bool HandleQueryDragIcon(WXHICON *hIcon);
 


@@ -473,18 +446,6 @@ private:
     DECLARE_EVENT_TABLE()
 };
 
     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
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // global functions
 // ---------------------------------------------------------------------------


@@ -512,11 +473,7 @@ public:
 #include "wx/hash.h"
 
 // pseudo-template HWND <-> wxWindow hash table
 #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);
 WX_DECLARE_HASH(wxWindowPalm, wxWindowList, wxWinHashTable);

-#endif

 
 extern wxWinHashTable *wxWinHandleHash;
 
 
 extern wxWinHashTable *wxWinHandleHash;