wxPalmOS was introduced long after 2.4.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31136 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/palmos/app.h b/include/wx/palmos/app.h
index d9527d5771e824b7d6de2eaa2ed67ea159721a17..153d1e6968f4c5a2a82501bb7840027d72d5fb69 100644 (file)
--- a/include/wx/palmos/app.h
+++ b/include/wx/palmos/app.h
@@ -54,13 +54,6 @@ public:
     virtual bool OnExceptionInMainLoop();
 #endif // wxUSE_EXCEPTIONS
 
-    // deprecated functions, use wxEventLoop directly instead
-#if WXWIN_COMPATIBILITY_2_4
-    wxDEPRECATED( void DoMessage(WXMSG *pMsg) );
-    wxDEPRECATED( bool DoMessage() );
-    wxDEPRECATED( bool ProcessMessage(WXMSG* pMsg) );
-#endif // WXWIN_COMPATIBILITY_2_4
-
 protected:
     int    m_printMode; // wxPRINT_WINDOWS, wxPRINT_POSTSCRIPT
 

diff --git a/include/wx/palmos/bitmap.h b/include/wx/palmos/bitmap.h
index e51588aee48455a6d048a6e832697574bf902c67..f4f92cdc925de3340f1dd73d0a34e8c9983fa5d0 100644 (file)
--- a/include/wx/palmos/bitmap.h
+++ b/include/wx/palmos/bitmap.h
@@ -155,13 +155,6 @@ public:
     bool HasAlpha() const;
     void UseAlpha();
 
-#if WXWIN_COMPATIBILITY_2_4
-    // these functions do nothing and are only there for backwards
-    // compatibility
-    wxDEPRECATED( int GetQuality() const );
-    wxDEPRECATED( void SetQuality(int quality) );
-#endif // WXWIN_COMPATIBILITY_2_4
-
     // implementation only from now on
     // -------------------------------
 

diff --git a/include/wx/palmos/chkconf.h b/include/wx/palmos/chkconf.h
index d172c90ba65450bcc000ed2de94ff4b57d7702cd..9f880c25f1d07e9dabd56b386421716675dc9245 100644 (file)
--- a/include/wx/palmos/chkconf.h
+++ b/include/wx/palmos/chkconf.h
@@ -14,6 +14,10 @@
 #ifndef _WX_PALMOS_CHKCONF_H_
 #define _WX_PALMOS_CHKCONF_H_
 
+#if WXWIN_COMPATIBILITY_2_4
+    #error "wxPalmOS port was introduced after 2.4.X"
+#endif
+
 /*
  * disable the settings which don't work for some compilers
  */
@@ -21,7 +25,6 @@
 /*
  * If using PostScript-in-MSW in Univ, must enable PostScript
  */
-
 #if defined(__WXUNIVERSAL__) && wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW && !wxUSE_POSTSCRIPT
 #undef wxUSE_POSTSCRIPT
 #define wxUSE_POSTSCRIPT 1

diff --git a/include/wx/palmos/setup0.h b/include/wx/palmos/setup0.h
index a5b7d68066e9a7c2c2cc916a88fb3d52172098a3..3f254241d11f616d94d2e083cd695ad59eb31b80 100644 (file)
--- a/include/wx/palmos/setup0.h
+++ b/include/wx/palmos/setup0.h
@@ -42,7 +42,7 @@
 // in the version after it completely.
 //
 // Recommended setting: 0 (please update your code)
-#define WXWIN_COMPATIBILITY_2_4 1
+#define WXWIN_COMPATIBILITY_2_4 0
 
 // Set to 0 for accurate dialog units, else 1 to be as per 2.1.16 and before.
 // If migrating between versions, your dialogs may seem to shrink.

diff --git a/include/wx/palmos/taskbar.h b/include/wx/palmos/taskbar.h
index e6063d182f67008f2f99de3d872303456d957ab7..b381f0ea562852bb50f10f48b69187df4947cf63 100644 (file)
--- a/include/wx/palmos/taskbar.h
+++ b/include/wx/palmos/taskbar.h
@@ -38,19 +38,6 @@ public:
     bool RemoveIcon(void);
     bool PopupMenu(wxMenu *menu); //, int x, int y);
 
-#if WXWIN_COMPATIBILITY_2_4
-    wxDEPRECATED( bool IsOK() const );
-
-// Overridables
-    virtual void OnMouseMove(wxEvent&);
-    virtual void OnLButtonDown(wxEvent&);
-    virtual void OnLButtonUp(wxEvent&);
-    virtual void OnRButtonDown(wxEvent&);
-    virtual void OnRButtonUp(wxEvent&);
-    virtual void OnLButtonDClick(wxEvent&);
-    virtual void OnRButtonDClick(wxEvent&);
-#endif
-
 // Implementation
 protected:
     friend class wxTaskBarIconWindow;
@@ -63,24 +50,7 @@ protected:
     bool                 m_iconAdded;
     wxIcon               m_icon;
     wxString             m_strTooltip;
-
-#if WXWIN_COMPATIBILITY_2_4
-    // non-virtual default event handlers to forward events to the virtuals
-    void _OnMouseMove(wxTaskBarIconEvent&);
-    void _OnLButtonDown(wxTaskBarIconEvent&);
-    void _OnLButtonUp(wxTaskBarIconEvent&);
-    void _OnRButtonDown(wxTaskBarIconEvent&);
-    void _OnRButtonUp(wxTaskBarIconEvent&);
-    void _OnLButtonDClick(wxTaskBarIconEvent&);
-    void _OnRButtonDClick(wxTaskBarIconEvent&);
-
-    DECLARE_EVENT_TABLE()
-#endif
 };
 
-#if WXWIN_COMPATIBILITY_2_4
-inline bool wxTaskBarIcon::IsOK() const { return IsOk(); }
-#endif
-
 #endif
     // _TASKBAR_H_

diff --git a/include/wx/palmos/window.h b/include/wx/palmos/window.h
index 230bcbdff2defbbdb042ec4b6ec0eebebdec4842..636b7bc66e569e854faaba5eb8d730dae575e060 100644 (file)
--- a/include/wx/palmos/window.h
+++ b/include/wx/palmos/window.h
@@ -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?
@@ -465,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
 // ---------------------------------------------------------------------------
@@ -504,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;
 

diff --git a/src/palmos/bitmap.cpp b/src/palmos/bitmap.cpp
index 77bf3659f6ce73519ca17bd5885fc6e740273a65..201847b839bf28af1018992c7f52446b1f44a1e1 100644 (file)
--- a/src/palmos/bitmap.cpp
+++ b/src/palmos/bitmap.cpp
@@ -345,15 +345,6 @@ wxDC *wxBitmap::GetSelectedInto() const
 
 #endif
 
-#if WXWIN_COMPATIBILITY_2_4
-
-int wxBitmap::GetQuality() const
-{
-    return 0;
-}
-
-#endif // WXWIN_COMPATIBILITY_2_4
-
 void wxBitmap::UseAlpha()
 {
 }
@@ -387,14 +378,6 @@ void wxBitmap::SetMask(wxMask *mask)
 {
 }
 
-#if WXWIN_COMPATIBILITY_2_4
-
-void wxBitmap::SetQuality(int WXUNUSED(quality))
-{
-}
-
-#endif // WXWIN_COMPATIBILITY_2_4
-
 // ----------------------------------------------------------------------------
 // raw bitmap access support
 // ----------------------------------------------------------------------------

diff --git a/src/palmos/taskbar.cpp b/src/palmos/taskbar.cpp
index 3afea437f8e19f2dd2f19cc583bc4d36bbd02e1d..fe982906d8f426692b03a58fca6ff447dd28e0f5 100644 (file)
--- a/src/palmos/taskbar.cpp
+++ b/src/palmos/taskbar.cpp
@@ -34,19 +34,6 @@
 #include <string.h>
 #include "wx/taskbar.h"
 
-#if WXWIN_COMPATIBILITY_2_4
-BEGIN_EVENT_TABLE(wxTaskBarIcon, wxTaskBarIconBase)
-    EVT_TASKBAR_MOVE         (wxTaskBarIcon::_OnMouseMove)
-    EVT_TASKBAR_LEFT_DOWN    (wxTaskBarIcon::_OnLButtonDown)
-    EVT_TASKBAR_LEFT_UP      (wxTaskBarIcon::_OnLButtonUp)
-    EVT_TASKBAR_RIGHT_DOWN   (wxTaskBarIcon::_OnRButtonDown)
-    EVT_TASKBAR_RIGHT_UP     (wxTaskBarIcon::_OnRButtonUp)
-    EVT_TASKBAR_LEFT_DCLICK  (wxTaskBarIcon::_OnLButtonDClick)
-    EVT_TASKBAR_RIGHT_DCLICK (wxTaskBarIcon::_OnRButtonDClick)
-END_EVENT_TABLE()
-#endif
-
-
 IMPLEMENT_DYNAMIC_CLASS(wxTaskBarIcon, wxEvtHandler)
 
 // ============================================================================
@@ -108,32 +95,6 @@ bool wxTaskBarIcon::PopupMenu(wxMenu *menu)
        return false;
 }
 
-#if WXWIN_COMPATIBILITY_2_4
-// Overridables
-void wxTaskBarIcon::OnMouseMove(wxEvent& e)         { e.Skip(); }
-void wxTaskBarIcon::OnLButtonDown(wxEvent& e)       { e.Skip(); }
-void wxTaskBarIcon::OnLButtonUp(wxEvent& e)         { e.Skip(); }
-void wxTaskBarIcon::OnRButtonDown(wxEvent& e)       { e.Skip(); }
-void wxTaskBarIcon::OnRButtonUp(wxEvent& e)         { e.Skip(); }
-void wxTaskBarIcon::OnLButtonDClick(wxEvent& e)     { e.Skip(); }
-void wxTaskBarIcon::OnRButtonDClick(wxEvent& e)     { e.Skip(); }
-
-void wxTaskBarIcon::_OnMouseMove(wxTaskBarIconEvent& e)
-    { OnMouseMove(e);     }
-void wxTaskBarIcon::_OnLButtonDown(wxTaskBarIconEvent& e)
-    { OnLButtonDown(e);   }
-void wxTaskBarIcon::_OnLButtonUp(wxTaskBarIconEvent& e)
-    { OnLButtonUp(e);     }
-void wxTaskBarIcon::_OnRButtonDown(wxTaskBarIconEvent& e)
-    { OnRButtonDown(e);   }
-void wxTaskBarIcon::_OnRButtonUp(wxTaskBarIconEvent& e)
-    { OnRButtonUp(e);     }
-void wxTaskBarIcon::_OnLButtonDClick(wxTaskBarIconEvent& e)
-    { OnLButtonDClick(e); }
-void wxTaskBarIcon::_OnRButtonDClick(wxTaskBarIconEvent& e)
-    { OnRButtonDClick(e); }
-#endif
-
 void wxTaskBarIcon::RegisterWindowMessages()
 {
 }

diff --git a/src/palmos/treectrl.cpp b/src/palmos/treectrl.cpp
index f8e143d9494f1d8108f0b72f94a4d150f3c6596d..5655c5fd66865c4fe4670993d5e6f815cfeed78f 100644 (file)
--- a/src/palmos/treectrl.cpp
+++ b/src/palmos/treectrl.cpp
@@ -456,22 +456,6 @@ wxTreeItemId wxTreeCtrl::GetNextChild(const wxTreeItemId& WXUNUSED(item),
     return 0;
 }
 
-#if WXWIN_COMPATIBILITY_2_4
-
-wxTreeItemId wxTreeCtrl::GetFirstChild(const wxTreeItemId& item,
-                                       long& cookie) const
-{
-    return 0;
-}
-
-wxTreeItemId wxTreeCtrl::GetNextChild(const wxTreeItemId& WXUNUSED(item),
-                                      long& cookie) const
-{
-    return 0;
-}
-
-#endif // WXWIN_COMPATIBILITY_2_4
-
 wxTreeItemId wxTreeCtrl::GetLastChild(const wxTreeItemId& item) const
 {
     return 0;
@@ -533,19 +517,6 @@ wxTreeItemId wxTreeCtrl::DoInsertItem(const wxTreeItemId& parent,
     return 0;
 }
 
-// for compatibility only
-#if WXWIN_COMPATIBILITY_2_4
-
-wxTreeItemId wxTreeCtrl::InsertItem(const wxTreeItemId& parent,
-                                    const wxString& text,
-                                    int image, int selImage,
-                                    long insertAfter)
-{
-    return 0;
-}
-
-#endif // WXWIN_COMPATIBILITY_2_4
-
 wxTreeItemId wxTreeCtrl::AddRoot(const wxString& text,
                                  int image, int selectedImage,
                                  wxTreeItemData *data)
@@ -621,12 +592,6 @@ void wxTreeCtrl::Toggle(const wxTreeItemId& item)
 {
 }
 
-#if WXWIN_COMPATIBILITY_2_4
-void wxTreeCtrl::ExpandItem(const wxTreeItemId& item, int action)
-{
-}
-#endif
-
 void wxTreeCtrl::Unselect()
 {
 }