Old API clearly deprecated.

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

diff --git a/include/wx/ctrlsub.h b/include/wx/ctrlsub.h
index 0036c21f468a27f33842f467632cdae34ce9d1ed..dbf7e9884bf4d756bceb9ce1ae4cca01bf9b8fdb 100644 (file)
--- a/include/wx/ctrlsub.h
+++ b/include/wx/ctrlsub.h
@@ -99,7 +99,7 @@ public:
 #if WXWIN_COMPATIBILITY_2_2
     // compatibility - these functions are deprecated, use the new ones
     // instead
 #if WXWIN_COMPATIBILITY_2_2
     // compatibility - these functions are deprecated, use the new ones
     // instead

-    int Number() const { return GetCount(); }
+    wxDEPRECATED( int Number() const );

 #endif // WXWIN_COMPATIBILITY_2_2
 
 protected:
 #endif // WXWIN_COMPATIBILITY_2_2
 
 protected:

diff --git a/include/wx/dynload.h b/include/wx/dynload.h
index 6223cc385bd5504326e1f1a96e83a11d1148fab1..d70c8cfa1f0aba7f31589a94d3c106f81fe78636 100644 (file)
--- a/include/wx/dynload.h
+++ b/include/wx/dynload.h
@@ -116,7 +116,7 @@ public:
         // macro because it's of arguable use outside of that.
 
 #if WXWIN_COMPATIBILITY_2_2
         // macro because it's of arguable use outside of that.
 
 #if WXWIN_COMPATIBILITY_2_2

-    static wxPluginLibrary *GetObjectFromHandle(wxDllType handle);
+    wxDEPRECATED( static wxPluginLibrary *GetObjectFromHandle(wxDllType handle) );

 #endif
 
         // Instance methods.
 #endif
 
         // Instance methods.

diff --git a/include/wx/process.h b/include/wx/process.h
index fc7049d404959e59770fbabd1009dd1fc6721c82..6b54ca0a675069ebe9e1c3fc096b8a9b14824607 100644 (file)
--- a/include/wx/process.h
+++ b/include/wx/process.h
@@ -107,8 +107,7 @@ public:
 
     // for backwards compatibility only, don't use
 #if WXWIN_COMPATIBILITY_2_2
 
     // for backwards compatibility only, don't use
 #if WXWIN_COMPATIBILITY_2_2

-    wxProcess(wxEvtHandler *parent, bool redirect)
-        { Init(parent, wxID_ANY, redirect ? wxPROCESS_REDIRECT : wxPROCESS_DEFAULT); }
+    wxDEPRECATED( wxProcess(wxEvtHandler *parent, bool redirect) );

 #endif // WXWIN_COMPATIBILITY_2_2
 
 protected:
 #endif // WXWIN_COMPATIBILITY_2_2
 
 protected:

diff --git a/include/wx/scrolwin.h b/include/wx/scrolwin.h
index aae769bea40d8d218055344d4180cd9fe12ce0bf..cf9a27f234172d8d7f322c9dd9b8b907af343607 100644 (file)
--- a/include/wx/scrolwin.h
+++ b/include/wx/scrolwin.h
@@ -142,7 +142,7 @@ public:
 
 #if WXWIN_COMPATIBILITY_2_2
     // Compatibility only, don't use
 
 #if WXWIN_COMPATIBILITY_2_2
     // Compatibility only, don't use

-    void ViewStart(int *x, int *y) const { GetViewStart( x, y ); }
+    wxDEPRECATED( void ViewStart(int *x, int *y) const );

 #endif // WXWIN_COMPATIBILITY_2_2
 
 protected:
 #endif // WXWIN_COMPATIBILITY_2_2
 
 protected:

diff --git a/include/wx/stream.h b/include/wx/stream.h
index 5799895fe032553299848d2c849e01b785a40f87..41d8b5372fdf1e93bb8ec003007ce7707fa1fcc4 100644 (file)
--- a/include/wx/stream.h
+++ b/include/wx/stream.h
@@ -87,8 +87,8 @@ public:
 
 #if WXWIN_COMPATIBILITY_2_2
     // deprecated, for compatibility only
 
 #if WXWIN_COMPATIBILITY_2_2
     // deprecated, for compatibility only

-    wxStreamError LastError() const { return m_lasterror; }
-    size_t StreamSize() const { return GetSize(); }
+    wxDEPRECATED( wxStreamError LastError() const );
+    wxDEPRECATED( size_t StreamSize() const );

 #endif // WXWIN_COMPATIBILITY_2_2
 
 protected:
 #endif // WXWIN_COMPATIBILITY_2_2
 
 protected:

diff --git a/include/wx/wizard.h b/include/wx/wizard.h
index 9fc4e423cbaf2bdba83343712eb576a666dc7936..9bf871e1e3fcbef96b711919a41d059479502459 100644 (file)
--- a/include/wx/wizard.h
+++ b/include/wx/wizard.h
@@ -221,12 +221,12 @@ public:
 
     // wxWizard should be created using "new wxWizard" now, not with Create()
 #if WXWIN_COMPATIBILITY_2_2
 
     // wxWizard should be created using "new wxWizard" now, not with Create()
 #if WXWIN_COMPATIBILITY_2_2

-    static wxWizard *Create(wxWindow *parent,
-                            int id = wxID_ANY,
-                            const wxString& title = wxEmptyString,
-                            const wxBitmap& bitmap = wxNullBitmap,
-                            const wxPoint& pos = wxDefaultPosition,
-                            const wxSize& size = wxDefaultSize);
+    wxDEPRECATED( static wxWizard *Create(wxWindow *parent,
+                                          int id = wxID_ANY,
+                                          const wxString& title = wxEmptyString,
+                                          const wxBitmap& bitmap = wxNullBitmap,
+                                          const wxPoint& pos = wxDefaultPosition,
+                                          const wxSize& size = wxDefaultSize) );

 #endif // WXWIN_COMPATIBILITY_2_2
 
     // the methods below may be overridden by the derived classes to provide
 #endif // WXWIN_COMPATIBILITY_2_2
 
     // the methods below may be overridden by the derived classes to provide

diff --git a/src/common/ctrlsub.cpp b/src/common/ctrlsub.cpp
index 777737f6c3a873dcbd076c1b42e0058bd9f8896c..cf913548e08ba71cc9b73aa6aa125d357e671d6c 100644 (file)
--- a/src/common/ctrlsub.cpp
+++ b/src/common/ctrlsub.cpp
@@ -156,4 +156,13 @@ wxControlWithItems::~wxControlWithItems()
     // this destructor is required for Darwin
 }
 
     // this destructor is required for Darwin
 }
 

+#if WXWIN_COMPATIBILITY_2_2
+
+int wxItemContainer::Number() const
+{
+    return GetCount();
+}
+
+#endif // WXWIN_COMPATIBILITY_2_2
+

 #endif // wxUSE_CONTROLS
 #endif // wxUSE_CONTROLS

diff --git a/src/common/process.cpp b/src/common/process.cpp
index 3127c762c63c33068cea2e59597efdcb2826968c..518549e660f8571cb89841f3f3e22227fb64fb47 100644 (file)
--- a/src/common/process.cpp
+++ b/src/common/process.cpp
@@ -47,6 +47,15 @@ IMPLEMENT_DYNAMIC_CLASS(wxProcessEvent, wxEvent)
 // wxProcess creation
 // ----------------------------------------------------------------------------
 
 // wxProcess creation
 // ----------------------------------------------------------------------------
 

+#if WXWIN_COMPATIBILITY_2_2
+
+wxProcess::wxProcess(wxEvtHandler *parent, bool redirect)
+{
+    Init(parent, wxID_ANY, redirect ? wxPROCESS_REDIRECT : wxPROCESS_DEFAULT);
+}
+
+#endif // WXWIN_COMPATIBILITY_2_2
+

 void wxProcess::Init(wxEvtHandler *parent, int id, int flags)
 {
     if ( parent )
 void wxProcess::Init(wxEvtHandler *parent, int id, int flags)
 {
     if ( parent )

diff --git a/src/common/stream.cpp b/src/common/stream.cpp
index 62a8e98e7d971ac09cccf308b5e7c6bd787278b1..e797ad3f67686662de7508628230724fddfc7371 100644 (file)
--- a/src/common/stream.cpp
+++ b/src/common/stream.cpp
@@ -673,6 +673,20 @@ wxFileOffset wxStreamBase::OnSysTell() const
     return wxInvalidOffset;
 }
 
     return wxInvalidOffset;
 }
 

+#if WXWIN_COMPATIBILITY_2_2
+
+wxStreamError wxStreamBase::LastError() const
+{
+    return m_lasterror;
+}
+
+size_t wxStreamBase::StreamSize() const
+{
+    return GetSize();
+}
+
+#endif // WXWIN_COMPATIBILITY_2_2
+

 // ----------------------------------------------------------------------------
 // wxInputStream
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxInputStream
 // ----------------------------------------------------------------------------

diff --git a/src/generic/scrlwing.cpp b/src/generic/scrlwing.cpp
index ba82747eb1b5cec9f1c541a96768b976fe4b0a28..1fe62de7bf13252e2822d168772befa42ccef5f7 100644 (file)
--- a/src/generic/scrlwing.cpp
+++ b/src/generic/scrlwing.cpp
@@ -902,6 +902,15 @@ void wxScrollHelper::GetViewStart (int *x, int *y) const
         *y = m_yScrollPosition;
 }
 
         *y = m_yScrollPosition;
 }
 

+#if WXWIN_COMPATIBILITY_2_2
+
+void wxScrollHelper::ViewStart(int *x, int *y) const
+{
+    GetViewStart( x, y );
+}
+
+#endif // WXWIN_COMPATIBILITY_2_2
+

 void wxScrollHelper::DoCalcScrolledPosition(int x, int y, int *xx, int *yy) const
 {
     if ( xx )
 void wxScrollHelper::DoCalcScrolledPosition(int x, int y, int *xx, int *yy) const
 {
     if ( xx )