Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed WXWIN_COMPATIBILITY_2_2 together with code guarded by it.

Browse Source 
Changed default for WXWIN_COMPATIBILITY_2_4 to 0.
  Added WXWIN_COMPATIBILITY_2_6 (defaults to 1).
  Ran build/update-setup-h.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35858 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2005-10-09 15:48:42 +00:00
parent 92b0cd9eb0
commit dee1a63ff5
59 changed files with 990 additions and 1678 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1685
configure vendored
View File

File diff suppressed because it is too large Load Diff

18
configure.in
View File

@@ -857,8 +857,8 @@ WX_ARG_ENABLE(no_exceptions, [ --enable-no_exceptions create code without C++
WX_ARG_ENABLE(permissive, [ --enable-permissive compile code disregarding strict ANSI], wxUSE_PERMISSIVE)
WX_ARG_ENABLE(no_deps, [ --enable-no_deps create code without dependency information], wxUSE_NO_DEPS)
WX_ARG_ENABLE(compat22, [ --enable-compat22 enable wxWidgets 2.2 compatibility], WXWIN_COMPATIBILITY_2_2)
WX_ARG_ENABLE(compat24, [ --disable-compat24 disable wxWidgets 2.4 compatibility], WXWIN_COMPATIBILITY_2_4, disable)
WX_ARG_ENABLE(compat24, [ --enable-compat24 enable wxWidgets 2.4 compatibility], WXWIN_COMPATIBILITY_2_4, enable)
WX_ARG_ENABLE(compat26, [ --disable-compat26 disable wxWidgets 2.6 compatibility], WXWIN_COMPATIBILITY_2_6, disable)
WX_ARG_ENABLE(rpath, [ --disable-rpath disable use of rpath for uninstalled builds], wxUSE_RPATH)
@@ -5093,14 +5093,14 @@ dnl ---------------------------------------------------------------------------
dnl compatibility level
dnl ---------------------------------------------------------------------------
if test "x$WXWIN_COMPATIBILITY_2_2" = "xyes"; then
AC_DEFINE(WXWIN_COMPATIBILITY_2_2)
if test "x$WXWIN_COMPATIBILITY_2_4" = "xyes"; then
AC_DEFINE(WXWIN_COMPATIBILITY_2_4)
WXWIN_COMPATIBILITY_2_4="yes"
WXWIN_COMPATIBILITY_2_6="yes"
fi
if test "x$WXWIN_COMPATIBILITY_2_4" != "xno"; then
AC_DEFINE(WXWIN_COMPATIBILITY_2_4)
if test "x$WXWIN_COMPATIBILITY_2_6" != "xno"; then
AC_DEFINE(WXWIN_COMPATIBILITY_2_6)
fi
dnl ---------------------------------------------------------------------------
@@ -7366,8 +7366,8 @@ echo " Should wxWidgets be linked as a shared library? ${wxUSE_SHARED:-
echo " Should wxWidgets be compiled in Unicode mode? ${wxUSE_UNICODE:-no}"
echo " What level of wxWidgets compatibility should be enabled?"
echo " wxWidgets 2.2 ${WXWIN_COMPATIBILITY_2_2:-no}"
echo " wxWidgets 2.4 ${WXWIN_COMPATIBILITY_2_4:-yes}"
echo " wxWidgets 2.4 ${WXWIN_COMPATIBILITY_2_4:-no}"
echo " wxWidgets 2.6 ${WXWIN_COMPATIBILITY_2_6:-yes}"
echo " Which libraries should wxWidgets use?"
echo " jpeg ${wxUSE_LIBJPEG-none}"

12
include/wx/build.h
View File

@@ -77,16 +77,16 @@
#endif
// WXWIN_COMPATIBILITY macros affect presence of virtual functions
#if WXWIN_COMPATIBILITY_2_2
#define __WX_BO_WXWIN_COMPAT_2_2 ",compatible with 2.2"
#else
#define __WX_BO_WXWIN_COMPAT_2_2
#endif
#if WXWIN_COMPATIBILITY_2_4
#define __WX_BO_WXWIN_COMPAT_2_4 ",compatible with 2.4"
#else
#define __WX_BO_WXWIN_COMPAT_2_4
#endif
#if WXWIN_COMPATIBILITY_2_6
#define __WX_BO_WXWIN_COMPAT_2_6 ",compatible with 2.6"
#else
#define __WX_BO_WXWIN_COMPAT_2_6
#endif
// deriving wxWin containers from STL ones changes them completely:
#if wxUSE_STL
@@ -101,7 +101,7 @@
" (" __WX_BO_DEBUG "," __WX_BO_UNICODE \
__WX_BO_COMPILER \
__WX_BO_STL \
__WX_BO_WXWIN_COMPAT_2_2 __WX_BO_WXWIN_COMPAT_2_4 \
__WX_BO_WXWIN_COMPAT_2_4 __WX_BO_WXWIN_COMPAT_2_6 \
")"

15
include/wx/ctrlsub.h
View File

@@ -134,12 +134,6 @@ public:
bool HasClientUntypedData() const
{ return m_clientDataItemsType == wxClientData_Void; }
#if WXWIN_COMPATIBILITY_2_2
// compatibility - these functions are deprecated, use the new ones
// instead
wxDEPRECATED( int Number() const );
#endif // WXWIN_COMPATIBILITY_2_2
protected:
virtual int DoAppend(const wxString& item) = 0;
virtual int DoInsert(const wxString& item, int pos) = 0;
@@ -211,15 +205,6 @@ private:
// inline functions
// ----------------------------------------------------------------------------
#if WXWIN_COMPATIBILITY_2_2
inline int wxItemContainer::Number() const
{
return GetCount();
}
#endif // WXWIN_COMPATIBILITY_2_2
#endif // wxUSE_CONTROLS
#endif // _WX_CTRLSUB_H_BASE_

120
include/wx/dynlib.h
View File

@@ -286,10 +286,6 @@ public:
static wxString GetPluginsDirectory();
#if WXWIN_COMPATIBILITY_2_2
operator bool() const { return IsLoaded(); }
#endif
protected:
// common part of GetSymbol() and HasSymbol()
void *DoGetSymbol(const wxString& name, bool *success = 0) const;
@@ -312,122 +308,6 @@ protected:
};
// ----------------------------------------------------------------------------
// wxDllLoader: low level DLL functions, use wxDynamicLibrary in your code
// ----------------------------------------------------------------------------
#if WXWIN_COMPATIBILITY_2_2 && wxUSE_DYNAMIC_LOADER
#include "wx/object.h"
/*
wxDllLoader is a class providing an interface similar to unix's dlopen().
It is used by wxDynamicLibrary wxLibrary and manages the actual loading of
DLLs and the resolving of symbols in them. There are no instances of this
class, it simply serves as a namespace for its static member functions.
*/
class WXDLLIMPEXP_BASE wxDllLoader
{
public:
/*
This function loads the shared library libname into memory.
libname may be either the full path to the file or just the filename in
which case the library is searched for in all standard locations
(use GetDllExt() to construct the filename)
if success pointer is not NULL, it will be filled with true if everything
went ok and false otherwise
*/
static wxDllType LoadLibrary(const wxString& name, bool *success = NULL);
/*
This function unloads the shared library previously loaded with
LoadLibrary
*/
static void UnloadLibrary(wxDllType dll);
/*
This function returns a valid handle for the main program
itself or NULL if back linking is not supported by the current platform
(e.g. Win32).
*/
static wxDllType GetProgramHandle() { return wxDynamicLibrary::GetProgramHandle(); }
/*
This function resolves a symbol in a loaded DLL, such as a
variable or function name.
dllHandle Handle of the DLL, as returned by LoadDll().
name Name of the symbol.
Returns the pointer to the symbol or NULL on error.
*/
static void *GetSymbol(wxDllType dllHandle, const wxString &name, bool *success = 0);
// return the standard DLL extension (with leading dot) for this platform
static wxString GetDllExt() { return wxDynamicLibrary::GetDllExt(); }
private:
wxDllLoader(); // forbid construction of objects
};
// ----------------------------------------------------------------------------
// wxLibrary
// ----------------------------------------------------------------------------
#include "wx/hash.h"
class WXDLLIMPEXP_BASE wxLibrary : public wxObject
{
public:
wxLibrary(wxDllType handle);
virtual ~wxLibrary();
// Get a symbol from the dynamic library
void *GetSymbol(const wxString& symbname);
// Create the object whose classname is "name"
wxObject *CreateObject(const wxString& name);
protected:
void PrepareClasses(wxClassInfo *first);
wxDllType m_handle;
public:
wxHashTable classTable;
};
// ----------------------------------------------------------------------------
// wxLibraries
// ----------------------------------------------------------------------------
class WXDLLIMPEXP_BASE wxLibraries
{
public:
wxLibraries();
~wxLibraries();
// caller is responsible for deleting the returned pointer if !NULL
wxLibrary *LoadLibrary(const wxString& basename);
wxObject *CreateObject(const wxString& name);
protected:
wxList m_loaded;
};
// ----------------------------------------------------------------------------
// Global variables
// ----------------------------------------------------------------------------
extern WXDLLIMPEXP_DATA_BASE(wxLibraries) wxTheLibraries;
#endif // WXWIN_COMPATIBILITY_2_2 && wxUSE_DYNAMIC_LOADER
// ----------------------------------------------------------------------------
// Interesting defines
// ----------------------------------------------------------------------------

7
include/wx/dynload.h
View File

@@ -108,13 +108,6 @@ public:
int flags = wxDL_DEFAULT );
static bool UnloadLibrary(const wxString &libname);
// This is used by wxDllLoader. It's wrapped in the compatibility
// macro because it's of arguable use outside of that.
#if WXWIN_COMPATIBILITY_2_2
wxDEPRECATED( static wxPluginLibrary *GetObjectFromHandle(wxDllType handle) );
#endif
// Instance methods.
wxPluginManager() : m_entry(NULL) {}

5
include/wx/frame.h
View File

@@ -173,11 +173,6 @@ public:
// if you are hiding the help, true otherwise
virtual void DoGiveHelp(const wxString& text, bool show);
#if WXWIN_COMPATIBILITY_2_2
// call this to simulate a menu command
wxDEPRECATED( bool Command(int winid) );
#endif // WXWIN_COMPATIBILITY_2_2
protected:
// the frame main menu/status/tool bars
// ------------------------------------

8
include/wx/generic/treectlg.h
View File

@@ -207,14 +207,6 @@ public:
// get the parent of this item (may return NULL if root)
wxTreeItemId GetItemParent(const wxTreeItemId& item) const;
#if WXWIN_COMPATIBILITY_2_2
// deprecated: Use GetItemParent instead.
wxDEPRECATED( wxTreeItemId GetParent(const wxTreeItemId& item) const);
// Expose the base class method hidden by the one above. Not deprecatable.
wxWindow *GetParent() const { return wxScrolledWindow::GetParent(); }
#endif // WXWIN_COMPATIBILITY_2_2
// for this enumeration function you must pass in a "cookie" parameter
// which is opaque for the application but is necessary for the library
// to make these functions reentrant (i.e. allow more than one

5
include/wx/gtk/gauge.h
View File

@@ -82,11 +82,6 @@ public:
int m_rangeMax,
m_gaugePos;
// obsolete functions, don't use
#if WXWIN_COMPATIBILITY_2_2
bool GetProgressBar() const { return true; }
#endif // WXWIN_COMPATIBILITY_2_2
protected:
// common part of all ctors
void Init() { m_rangeMax = m_gaugePos = 0; }

7
include/wx/gtk/radiobox.h
View File

@@ -90,13 +90,6 @@ public:
int GetCount() const;
// for compatibility only, don't use these methods in new code!
#if WXWIN_COMPATIBILITY_2_2
wxDEPRECATED( int Number() const );
wxDEPRECATED( wxString GetLabel(int n) const );
wxDEPRECATED( void SetLabel( int item, const wxString& label ) );
#endif // WXWIN_COMPATIBILITY_2_2
// we have to override those to avoid virtual function name hiding
virtual wxString GetLabel() const { return wxControl::GetLabel(); }
virtual void SetLabel( const wxString& label );

5
include/wx/gtk/scrolwin.h
View File

@@ -163,11 +163,6 @@ public:
// Overridden from wxWidgets due callback being static
virtual void SetScrollPos( int orient, int pos, bool refresh = TRUE );
#if WXWIN_COMPATIBILITY_2_2
// Compatibility
void ViewStart(int *x, int *y) const { GetViewStart( x, y ); }
#endif // WXWIN_COMPATIBILITY_2_2
virtual void DoPrepareDC(wxDC& dc);
protected:

5
include/wx/gtk1/gauge.h
View File

@@ -82,11 +82,6 @@ public:
int m_rangeMax,
m_gaugePos;
// obsolete functions, don't use
#if WXWIN_COMPATIBILITY_2_2
bool GetProgressBar() const { return true; }
#endif // WXWIN_COMPATIBILITY_2_2
protected:
// common part of all ctors
void Init() { m_rangeMax = m_gaugePos = 0; }

7
include/wx/gtk1/radiobox.h
View File

@@ -90,13 +90,6 @@ public:
int GetCount() const;
// for compatibility only, don't use these methods in new code!
#if WXWIN_COMPATIBILITY_2_2
wxDEPRECATED( int Number() const );
wxDEPRECATED( wxString GetLabel(int n) const );
wxDEPRECATED( void SetLabel( int item, const wxString& label ) );
#endif // WXWIN_COMPATIBILITY_2_2
// we have to override those to avoid virtual function name hiding
virtual wxString GetLabel() const { return wxControl::GetLabel(); }
virtual void SetLabel( const wxString& label );

5
include/wx/gtk1/scrolwin.h
View File

@@ -163,11 +163,6 @@ public:
// Overridden from wxWidgets due callback being static
virtual void SetScrollPos( int orient, int pos, bool refresh = TRUE );
#if WXWIN_COMPATIBILITY_2_2
// Compatibility
void ViewStart(int *x, int *y) const { GetViewStart( x, y ); }
#endif // WXWIN_COMPATIBILITY_2_2
virtual void DoPrepareDC(wxDC& dc);
protected:

6
include/wx/html/htmltag.h
View File

@@ -110,12 +110,6 @@ public:
// Returns string containing all params.
wxString GetAllParams() const;
#if WXWIN_COMPATIBILITY_2_2
// return true if this is ending tag (</something>) or false
// if it isn't (<something>)
wxDEPRECATED( bool IsEnding() const );
#endif
// return true if this there is matching ending tag
inline bool HasEnding() const {return m_End1 >= 0;}

9
include/wx/listbase.h
View File

@@ -381,15 +381,6 @@ public:
bool IsEditCancelled() const { return m_editCancelled; }
void SetEditCanceled(bool editCancelled) { m_editCancelled = editCancelled; }
#if WXWIN_COMPATIBILITY_2_2
// these methods don't do anything at all
long GetOldIndex() const { return 0; }
long GetOldItem() const { return 0; }
// this one is superseded by GetKeyCode()
int GetCode() const { return GetKeyCode(); }
#endif // WXWIN_COMPATIBILITY_2_2
virtual wxEvent *Clone() const { return new wxListEvent(*this); }
//protected: -- not for backwards compatibility

8
include/wx/mac/setup0.h
View File

@@ -28,15 +28,15 @@
// compatibility settings
// ----------------------------------------------------------------------------
// This setting determines the compatibility with 2.2 API: set it to 1 to
// This setting determines the compatibility with 2.4 API: set it to 1 to
// enable it but please consider updating your code instead.
//
// Default is 0
//
// Recommended setting: 0 (please update your code)
#define WXWIN_COMPATIBILITY_2_2 0
#define WXWIN_COMPATIBILITY_2_4 0
// This setting determines the compatibility with 2.4 API: set it to 0 to
// This setting determines the compatibility with 2.6 API: set it to 0 to
// flag all cases of using deprecated functions.
//
// Default is 1 but please try building your code with 0 as the default will
@@ -44,7 +44,7 @@
// in the version after it completely.
//
// Recommended setting: 0 (please update your code)
#define WXWIN_COMPATIBILITY_2_4 1
#define WXWIN_COMPATIBILITY_2_6 1
// MSW-only: Set to 0 for accurate dialog units, else 1 for old behaviour when
// default system font is used for wxWindow::GetCharWidth/Height() instead of

8
include/wx/motif/setup0.h
View File

@@ -27,15 +27,15 @@
// compatibility settings
// ----------------------------------------------------------------------------
// This setting determines the compatibility with 2.2 API: set it to 1 to
// This setting determines the compatibility with 2.4 API: set it to 1 to
// enable it but please consider updating your code instead.
//
// Default is 0
//
// Recommended setting: 0 (please update your code)
#define WXWIN_COMPATIBILITY_2_2 0
#define WXWIN_COMPATIBILITY_2_4 0
// This setting determines the compatibility with 2.4 API: set it to 0 to
// This setting determines the compatibility with 2.6 API: set it to 0 to
// flag all cases of using deprecated functions.
//
// Default is 1 but please try building your code with 0 as the default will
@@ -43,7 +43,7 @@
// in the version after it completely.
//
// Recommended setting: 0 (please update your code)
#define WXWIN_COMPATIBILITY_2_4 1
#define WXWIN_COMPATIBILITY_2_6 1
// MSW-only: Set to 0 for accurate dialog units, else 1 for old behaviour when
// default system font is used for wxWindow::GetCharWidth/Height() instead of

8
include/wx/msw/setup0.h
View File

@@ -27,15 +27,15 @@
// compatibility settings
// ----------------------------------------------------------------------------
// This setting determines the compatibility with 2.2 API: set it to 1 to
// This setting determines the compatibility with 2.4 API: set it to 1 to
// enable it but please consider updating your code instead.
//
// Default is 0
//
// Recommended setting: 0 (please update your code)
#define WXWIN_COMPATIBILITY_2_2 0
#define WXWIN_COMPATIBILITY_2_4 0
// This setting determines the compatibility with 2.4 API: set it to 0 to
// This setting determines the compatibility with 2.6 API: set it to 0 to
// flag all cases of using deprecated functions.
//
// Default is 1 but please try building your code with 0 as the default will
@@ -43,7 +43,7 @@
// in the version after it completely.
//
// Recommended setting: 0 (please update your code)
#define WXWIN_COMPATIBILITY_2_4 1
#define WXWIN_COMPATIBILITY_2_6 1
// MSW-only: Set to 0 for accurate dialog units, else 1 for old behaviour when
// default system font is used for wxWindow::GetCharWidth/Height() instead of

20
include/wx/msw/setup_microwin.h
View File

@@ -28,13 +28,23 @@
// compatibility settings
// ----------------------------------------------------------------------------
// This setting determines the compatibility with 2.2 API: set it to 1 to
// enable it
// This setting determines the compatibility with 2.4 API: set it to 1 to
// enable it but please consider updating your code instead.
//
// Default is 1.
// Default is 0
//
// Recommended setting: 0 (please update your code instead!)
#define WXWIN_COMPATIBILITY_2_2 1
// Recommended setting: 0 (please update your code)
#define WXWIN_COMPATIBILITY_2_4 0
// This setting determines the compatibility with 2.6 API: set it to 0 to
// flag all cases of using deprecated functions.
//
// Default is 1 but please try building your code with 0 as the default will
// change to 0 in the next version and the deprecated functions will disappear
// in the version after it completely.
//
// Recommended setting: 0 (please update your code)
#define WXWIN_COMPATIBILITY_2_6 1
// 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.

8
include/wx/msw/treectrl.h
View File

@@ -209,14 +209,6 @@ public:
// get the parent of this item (may return NULL if root)
wxTreeItemId GetItemParent(const wxTreeItemId& item) const;
#if WXWIN_COMPATIBILITY_2_2
// deprecated: Use GetItemParent instead.
wxDEPRECATED( wxTreeItemId GetParent(const wxTreeItemId& item) const);
// Expose the base class method hidden by the one above. Not deprecatable.
wxWindow *GetParent() const { return wxControl::GetParent(); }
#endif // WXWIN_COMPATIBILITY_2_2
// for this enumeration function you must pass in a "cookie" parameter
// which is opaque for the application but is necessary for the library
// to make these functions reentrant (i.e. allow more than one

34
include/wx/msw/wince/setup.h
View File

@@ -27,15 +27,15 @@
// compatibility settings
// ----------------------------------------------------------------------------
// This setting determines the compatibility with 2.2 API: set it to 1 to
// This setting determines the compatibility with 2.4 API: set it to 1 to
// enable it but please consider updating your code instead.
//
// Default is 0
//
// Recommended setting: 0 (please update your code)
#define WXWIN_COMPATIBILITY_2_2 0
#define WXWIN_COMPATIBILITY_2_4 0
// This setting determines the compatibility with 2.4 API: set it to 0 to
// This setting determines the compatibility with 2.6 API: set it to 0 to
// flag all cases of using deprecated functions.
//
// Default is 1 but please try building your code with 0 as the default will
@@ -43,7 +43,7 @@
// in the version after it completely.
//
// Recommended setting: 0 (please update your code)
#define WXWIN_COMPATIBILITY_2_4 1
#define WXWIN_COMPATIBILITY_2_6 1
// MSW-only: Set to 0 for accurate dialog units, else 1 for old behaviour when
// default system font is used for wxWindow::GetCharWidth/Height() instead of
@@ -120,7 +120,7 @@
// Default is 1
//
// Recommended setting: 1 if your compiler supports it.
#define wxUSE_ON_FATAL_EXCEPTION 0
#define wxUSE_ON_FATAL_EXCEPTION 1
// Set this to 1 to be able to generate a human-readable (unlike
// machine-readable minidump created by wxCrashReport::Generate()) stack back
@@ -129,7 +129,7 @@
// Default is 1 if supported by the compiler.
//
// Recommended setting: 1, set to 0 if your programs never crash
#define wxUSE_STACKWALKER 0
#define wxUSE_STACKWALKER 1
// Set this to 1 to compile in wxDebugReport class which allows you to create
// and optionally upload to your web site a debug report consisting of back
@@ -139,7 +139,7 @@
//
// Recommended setting: 1, it is compiled into a separate library so there
// is no overhead if you don't use it
#define wxUSE_DEBUGREPORT 0
#define wxUSE_DEBUGREPORT 1
// ----------------------------------------------------------------------------
// Unicode support
@@ -188,7 +188,7 @@
//
// Recommended setting: depends on whether you intend to use C++ exceptions
// in your own code (1 if you do, 0 if you don't)
#define wxUSE_EXCEPTIONS 0
#define wxUSE_EXCEPTIONS 1
// Set wxUSE_EXTENDED_RTTI to 1 to use extended RTTI
//
@@ -472,20 +472,6 @@
// Recommended setting: 1
#define wxUSE_MEDIACTRL 1
// Use QuickTime
//
// Default is 0
//
// Recommended setting: 1 if you have the QT SDK installed and you need it, else 0
#define wxUSE_QUICKTIME 0
// Use DirectShow (requires linkage to strmiids.lib)
//
// Default is 0
//
// Recommended setting: 1 if the DirectX 7 SDK is installed (highly recommended), else 0
#define wxUSE_DIRECTSHOW 0
// Use GStreamer for Unix (req a lot of dependancies)
//
// Default is 0
@@ -922,11 +908,11 @@
// 0 for no interprocess comms
#define wxUSE_HELP 1
// 0 for no help facility
#define wxUSE_MS_HTML_HELP 0
#define wxUSE_MS_HTML_HELP 1
// 0 for no MS HTML Help
// Use wxHTML-based help controller?
#define wxUSE_WXHTML_HELP 0
#define wxUSE_WXHTML_HELP 1
#define wxUSE_RESOURCES 0
// 0 for no wxGetResource/wxWriteResource

8
include/wx/os2/setup0.h
View File

@@ -28,15 +28,15 @@
// compatibility settings
// ----------------------------------------------------------------------------
// This setting determines the compatibility with 2.2 API: set it to 1 to
// This setting determines the compatibility with 2.4 API: set it to 1 to
// enable it but please consider updating your code instead.
//
// Default is 0
//
// Recommended setting: 0 (please update your code)
#define WXWIN_COMPATIBILITY_2_2 0
#define WXWIN_COMPATIBILITY_2_4 0
// This setting determines the compatibility with 2.4 API: set it to 0 to
// This setting determines the compatibility with 2.6 API: set it to 0 to
// flag all cases of using deprecated functions.
//
// Default is 1 but please try building your code with 0 as the default will
@@ -44,7 +44,7 @@
// in the version after it completely.
//
// Recommended setting: 0 (please update your code)
#define WXWIN_COMPATIBILITY_2_4 1
#define WXWIN_COMPATIBILITY_2_6 1
// MSW-only: Set to 0 for accurate dialog units, else 1 for old behaviour when
// default system font is used for wxWindow::GetCharWidth/Height() instead of

8
include/wx/os2/treectrl.h
View File

@@ -273,14 +273,6 @@ public:
//
wxTreeItemId GetItemParent(const wxTreeItemId& rItem) const;
#if WXWIN_COMPATIBILITY_2_2
// deprecated: Use GetItemParent instead.
wxDEPRECATED( wxTreeItemId GetParent(const wxTreeItemId& item) const);
// Expose the base class method hidden by the one above. Not deprecatable.
wxWindow *GetParent() const { return wxControl::GetParent(); }
#endif // WXWIN_COMPATIBILITY_2_2
// for this enumeration function you must pass in a "cookie" parameter
// which is opaque for the application but is necessary for the library
// to make these functions reentrant (i.e. allow more than one

8
include/wx/palmos/setup0.h
View File

@@ -26,15 +26,15 @@
// compatibility settings
// ----------------------------------------------------------------------------
// This setting determines the compatibility with 2.2 API: set it to 1 to
// This setting determines the compatibility with 2.4 API: set it to 1 to
// enable it but please consider updating your code instead.
//
// Default is 0
//
// Recommended setting: 0 (please update your code)
#define WXWIN_COMPATIBILITY_2_2 0
#define WXWIN_COMPATIBILITY_2_4 0
// This setting determines the compatibility with 2.4 API: set it to 0 to
// This setting determines the compatibility with 2.6 API: set it to 0 to
// flag all cases of using deprecated functions.
//
// Default is 1 but please try building your code with 0 as the default will
@@ -42,7 +42,7 @@
// in the version after it completely.
//
// Recommended setting: 0 (please update your code)
#define WXWIN_COMPATIBILITY_2_4 0
#define WXWIN_COMPATIBILITY_2_6 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.

5
include/wx/process.h
View File

@@ -101,11 +101,6 @@ public:
wxInputStream *errStream);
#endif // wxUSE_STREAMS
// for backwards compatibility only, don't use
#if WXWIN_COMPATIBILITY_2_2
wxDEPRECATED( wxProcess(wxEvtHandler *parent, bool redirect) );
#endif // WXWIN_COMPATIBILITY_2_2
protected:
void Init(wxEvtHandler *parent, int id, int flags);

7
include/wx/radiobox.h
View File

@@ -45,13 +45,6 @@ public:
wxDEPRECATED( int GetNumberOfRowsOrCols() const );
wxDEPRECATED( void SetNumberOfRowsOrCols(int n) );
#endif // WXWIN_COMPATIBILITY_2_4
// for compatibility only, don't use these methods in new code!
#if WXWIN_COMPATIBILITY_2_2
wxDEPRECATED( int Number() const );
wxDEPRECATED( wxString GetLabel(int n) const );
wxDEPRECATED( void SetLabel(int n, const wxString& label) );
#endif // WXWIN_COMPATIBILITY_2_2
};
#if defined(__WXUNIVERSAL__)

5
include/wx/scrolwin.h
View File

@@ -140,11 +140,6 @@ public:
// once it is fixed!
void OnScroll(wxScrollWinEvent& event) { HandleOnScroll(event); }
#if WXWIN_COMPATIBILITY_2_2
// Compatibility only, don't use
wxDEPRECATED( void ViewStart(int *x, int *y) const );
#endif // WXWIN_COMPATIBILITY_2_2
protected:
// get pointer to our scroll rect if we use it or NULL
const wxRect *GetScrollRect() const

8
include/wx/setup_inc.h
View File

@@ -23,15 +23,15 @@
// compatibility settings
// ----------------------------------------------------------------------------
// This setting determines the compatibility with 2.2 API: set it to 1 to
// This setting determines the compatibility with 2.4 API: set it to 1 to
// enable it but please consider updating your code instead.
//
// Default is 0
//
// Recommended setting: 0 (please update your code)
#define WXWIN_COMPATIBILITY_2_2 0
#define WXWIN_COMPATIBILITY_2_4 0
// This setting determines the compatibility with 2.4 API: set it to 0 to
// This setting determines the compatibility with 2.6 API: set it to 0 to
// flag all cases of using deprecated functions.
//
// Default is 1 but please try building your code with 0 as the default will
@@ -39,7 +39,7 @@
// in the version after it completely.
//
// Recommended setting: 0 (please update your code)
#define WXWIN_COMPATIBILITY_2_4 1
#define WXWIN_COMPATIBILITY_2_6 1
// MSW-only: Set to 0 for accurate dialog units, else 1 for old behaviour when
// default system font is used for wxWindow::GetCharWidth/Height() instead of

20
include/wx/stream.h
View File

@@ -42,19 +42,6 @@ enum wxStreamError
wxSTREAM_READ_ERROR // generic read error
};
// compatibility
#if WXWIN_COMPATIBILITY_2_2
#define wxStream_NOERROR wxSTREAM_NOERROR
#define wxStream_EOF wxSTREAM_EOF
#define wxStream_WRITE_ERR wxSTREAM_WRITE_ERROR
#define wxStream_READ_ERR wxSTREAM_READ_ERROR
#define wxSTREAM_NO_ERR wxSTREAM_NO_ERROR
#define wxSTREAM_NOERROR wxSTREAM_NO_ERROR
#define wxSTREAM_WRITE_ERR wxSTREAM_WRITE_ERROR
#define wxSTREAM_READ_ERR wxSTREAM_READ_ERROR
#endif // WXWIN_COMPATIBILITY_2_2
// ============================================================================
// base stream classes: wxInputStream and wxOutputStream
// ============================================================================
@@ -84,13 +71,6 @@ public:
// returns true if the streams supports seeking to arbitrary offsets
virtual bool IsSeekable() const { return false; }
#if WXWIN_COMPATIBILITY_2_2
// deprecated, for compatibility only
wxDEPRECATED( wxStreamError LastError() const );
wxDEPRECATED( size_t StreamSize() const );
#endif // WXWIN_COMPATIBILITY_2_2
// Reserved for future use
virtual void ReservedStreamFunc1() {}
virtual void ReservedStreamFunc2() {}

9
include/wx/tbarbase.h
View File

@@ -194,15 +194,6 @@ public:
virtual void Detach() { m_tbar = (wxToolBarBase *)NULL; }
virtual void Attach(wxToolBarBase *tbar) { m_tbar = tbar; }
// compatibility only, don't use
#if WXWIN_COMPATIBILITY_2_2
wxDEPRECATED( const wxBitmap& GetBitmap1() const );
wxDEPRECATED( const wxBitmap& GetBitmap2() const );
wxDEPRECATED( void SetBitmap1(const wxBitmap& bmp) );
wxDEPRECATED( void SetBitmap2(const wxBitmap& bmp) );
#endif // WXWIN_COMPATIBILITY_2_2
protected:
wxToolBarBase *m_tbar; // the toolbar to which we belong (may be NULL)

5
include/wx/treebase.h
View File

@@ -300,11 +300,6 @@ public:
void SetToolTip(const wxString& toolTip) { m_label = toolTip; }
wxString GetToolTip() { return m_label; }
#if WXWIN_COMPATIBILITY_2_2
// for compatibility only, don't use
wxDEPRECATED( int GetCode() const);
#endif // WXWIN_COMPATIBILITY_2_2
private:
// not all of the members are used (or initialized) for all events
wxKeyEvent m_evtKey;

8
include/wx/univ/setup0.h
View File

@@ -26,15 +26,15 @@
// compatibility settings
// ----------------------------------------------------------------------------
// This setting determines the compatibility with 2.0 API: set it to 1 to
// This setting determines the compatibility with 2.4 API: set it to 1 to
// enable it
//
// Default is 0.
//
// Recommended setting: 0 (please update your code instead!)
#define WXWIN_COMPATIBILITY_2_2 0
#define WXWIN_COMPATIBILITY_2_4 0
// This setting determines the compatibility with 2.2 API: set it to 0 to
// This setting determines the compatibility with 2.6 API: set it to 0 to
// flag all cases of using deprecated functions.
//
// Default is 1 but please try building your code with 0 as the default will
@@ -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_6 1
// 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.

16
include/wx/utils.h
View File

@@ -564,21 +564,5 @@ WXDLLIMPEXP_BASE bool wxYieldIfNeeded();
// Error message functions used by wxWidgets (deprecated, use wxLog)
// ----------------------------------------------------------------------------
#if WXWIN_COMPATIBILITY_2_2
// Format a message on the standard error (UNIX) or the debugging
// stream (Windows)
wxDEPRECATED( WXDLLIMPEXP_BASE void wxDebugMsg(const wxChar *fmt ...) ATTRIBUTE_PRINTF_1 );
// Non-fatal error (continues)
extern WXDLLIMPEXP_DATA_BASE(const wxChar*) wxInternalErrorStr;
wxDEPRECATED( WXDLLIMPEXP_BASE void wxError(const wxString& msg, const wxString& title = wxInternalErrorStr) );
// Fatal error (exits)
extern WXDLLIMPEXP_DATA_BASE(const wxChar*) wxFatalErrorStr;
wxDEPRECATED( WXDLLIMPEXP_BASE void wxFatalError(const wxString& msg, const wxString& title = wxFatalErrorStr) );
#endif // WXWIN_COMPATIBILITY_2_2
#endif
// _WX_UTILSH__

10
include/wx/wizard.h
View File

@@ -222,16 +222,6 @@ public:
// page to GetPageAreaSizer and 5 if you don't.
virtual void SetBorder(int border) = 0;
// wxWizard should be created using "new wxWizard" now, not with Create()
#if WXWIN_COMPATIBILITY_2_2
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
// custom logic for determining the pages order

4
setup.h.in
View File

@@ -148,10 +148,10 @@
#endif
#define WXWIN_COMPATIBILITY_2_2 0
#define WXWIN_COMPATIBILITY_2_4 0
#define WXWIN_COMPATIBILITY_2_6 0
#define wxDIALOG_UNIT_COMPATIBILITY 0

4
setup.h_vms
View File

@@ -156,10 +156,10 @@
#endif
#define WXWIN_COMPATIBILITY_2_2 1
#define WXWIN_COMPATIBILITY_2_4 1
#define WXWIN_COMPATIBILITY_2_6 1
#define wxDIALOG_UNIT_COMPATIBILITY 1

3
src/cocoa/app.mm
View File

@@ -232,9 +232,6 @@ wxApp::wxApp()
{
m_topWindow = NULL;
#if WXWIN_COMPATIBILITY_2_2
m_wantDebugOutput = TRUE;
#endif
#ifdef __WXDEBUG__
m_isInAssert = FALSE;
#endif // __WXDEBUG__

6
src/common/artstd.cpp
View File

@@ -20,12 +20,6 @@
#pragma hdrstop
#endif
#ifndef WX_PRECOMP
#if WXWIN_COMPATIBILITY_2_2
#include "wx/app.h"
#endif
#endif
#include "wx/artprov.h"
#include "wx/image.h"

220
src/common/dynload.cpp
View File

@@ -359,225 +359,5 @@ void wxPluginManager::Unload()
m_entry = NULL;
}
#if WXWIN_COMPATIBILITY_2_2
wxPluginLibrary *wxPluginManager::GetObjectFromHandle(wxDllType handle)
{
for ( wxDLManifest::iterator i = ms_manifest->begin();
i != ms_manifest->end();
++i )
{
wxPluginLibrary * const lib = i->second;
if ( lib->GetLibHandle() == handle )
return lib;
}
return NULL;
}
// ---------------------------------------------------------------------------
// wxDllLoader (all these methods are static)
// ---------------------------------------------------------------------------
wxDllType wxDllLoader::LoadLibrary(const wxString &name, bool *success)
{
wxPluginLibrary *p = wxPluginManager::LoadLibrary
(
name,
wxDL_DEFAULT | wxDL_VERBATIM | wxDL_NOSHARE
);
if ( success )
*success = p != NULL;
return p ? p->GetLibHandle() : 0;
}
void wxDllLoader::UnloadLibrary(wxDllType handle)
{
wxPluginLibrary *p = wxPluginManager::GetObjectFromHandle(handle);
wxCHECK_RET( p, _T("Unloading a library not loaded with wxDllLoader?") );
p->UnrefLib();
}
void *
wxDllLoader::GetSymbol(wxDllType dllHandle, const wxString &name, bool *success)
{
wxPluginLibrary *p = wxPluginManager::GetObjectFromHandle(dllHandle);
if ( !p )
{
wxFAIL_MSG( _T("Using a library not loaded with wxDllLoader?") );
if ( success )
*success = false;
return NULL;
}
return p->GetSymbol(name, success);
}
// ---------------------------------------------------------------------------
// Global variables
// ---------------------------------------------------------------------------
wxLibraries wxTheLibraries;
// ============================================================================
// implementation
// ============================================================================
// construct the full name from the base shared object name: adds a .dll
// suffix under Windows or .so under Unix
static wxString ConstructLibraryName(const wxString& basename)
{
wxString fullname;
fullname << basename << wxDllLoader::GetDllExt();
return fullname;
}
// ---------------------------------------------------------------------------
// wxLibrary (one instance per dynamic library)
// ---------------------------------------------------------------------------
wxLibrary::wxLibrary(wxDllType handle)
{
typedef wxClassInfo *(*t_get_first)(void);
t_get_first get_first;
m_handle = handle;
// Some system may use a local heap for library.
get_first = (t_get_first)GetSymbol(_T("wxGetClassFirst"));
// It is a wxWidgets DLL.
if (get_first)
PrepareClasses(get_first());
}
wxLibrary::~wxLibrary()
{
if ( m_handle )
{
wxDllLoader::UnloadLibrary(m_handle);
}
}
wxObject *wxLibrary::CreateObject(const wxString& name)
{
wxClassInfo *info = (wxClassInfo *)classTable.Get(name);
if (!info)
return NULL;
return info->CreateObject();
}
void wxLibrary::PrepareClasses(wxClassInfo *first)
{
// Index all class infos by their class name
wxClassInfo *info = first;
while (info)
{
if (info->m_className)
classTable.Put(info->m_className, (wxObject *)info);
info = info->m_next;
}
#if !wxUSE_EXTENDED_RTTI
// Set base pointers for each wxClassInfo
info = first;
while (info)
{
if (info->GetBaseClassName1())
info->m_baseInfo1 = (wxClassInfo *)classTable.Get(info->GetBaseClassName1());
if (info->GetBaseClassName2())
info->m_baseInfo2 = (wxClassInfo *)classTable.Get(info->GetBaseClassName2());
info = info->m_next;
}
#endif
}
void *wxLibrary::GetSymbol(const wxString& symbname)
{
return wxDllLoader::GetSymbol(m_handle, symbname);
}
// ---------------------------------------------------------------------------
// wxLibraries (only one instance should normally exist)
// ---------------------------------------------------------------------------
wxLibraries::wxLibraries():m_loaded(wxKEY_STRING)
{
}
wxLibraries::~wxLibraries()
{
wxNode *node = m_loaded.GetFirst();
while (node) {
wxLibrary *lib = (wxLibrary *)node->GetData();
delete lib;
node = node->GetNext();
}
}
wxLibrary *wxLibraries::LoadLibrary(const wxString& name)
{
wxLibrary *lib;
wxClassInfo *old_sm_first;
wxNode *node = m_loaded.Find(name.GetData());
if (node != NULL)
return ((wxLibrary *)node->GetData());
// If DLL shares data, this is necessary.
old_sm_first = wxClassInfo::sm_first;
wxClassInfo::sm_first = NULL;
wxString libname = ConstructLibraryName(name);
bool success = false;
wxDllType handle = wxDllLoader::LoadLibrary(libname, &success);
if(success)
{
lib = new wxLibrary(handle);
wxClassInfo::sm_first = old_sm_first;
m_loaded.Append(name.GetData(), lib);
}
else
lib = NULL;
return lib;
}
wxObject *wxLibraries::CreateObject(const wxString& path)
{
wxNode *node = m_loaded.GetFirst();
wxObject *obj;
while (node) {
obj = ((wxLibrary *)node->GetData())->CreateObject(path);
if (obj)
return obj;
node = node->GetNext();
}
return NULL;
}
#endif // WXWIN_COMPATIBILITY_2_2
#endif // wxUSE_DYNAMIC_LOADER

9
src/common/framecmn.cpp
View File

@@ -568,12 +568,3 @@ void wxFrameBase::SetMenuBar(wxMenuBar *menubar)
}
#endif // wxUSE_MENUS
#if WXWIN_COMPATIBILITY_2_2
bool wxFrameBase::Command(int winid)
{
return ProcessCommand(winid);
}
#endif // WXWIN_COMPATIBILITY_2_2

9
src/common/process.cpp
View File

@@ -43,15 +43,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxProcessEvent, wxEvent)
// 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 )

19
src/common/radiocmn.cpp
View File

@@ -144,23 +144,4 @@ void wxRadioBoxBase::SetNumberOfRowsOrCols(int WXUNUSED(n))
#endif // WXWIN_COMPATIBILITY_2_4
#if WXWIN_COMPATIBILITY_2_2
int wxRadioBoxBase::Number() const
{
return GetCount();
}
wxString wxRadioBoxBase::GetLabel(int n) const
{
return GetString(n);
}
void wxRadioBoxBase::SetLabel(int n, const wxString& label)
{
SetString(n, label);
}
#endif // WXWIN_COMPATIBILITY_2_2
#endif // wxUSE_RADIOBOX

14
src/common/stream.cpp
View File

@@ -679,20 +679,6 @@ wxFileOffset wxStreamBase::OnSysTell() const
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
// ----------------------------------------------------------------------------

24
src/common/tbarbase.cpp
View File

@@ -113,30 +113,6 @@ bool wxToolBarToolBase::SetLongHelp(const wxString& help)
return true;
}
#if WXWIN_COMPATIBILITY_2_2
const wxBitmap& wxToolBarToolBase::GetBitmap1() const
{
return GetNormalBitmap();
}
const wxBitmap& wxToolBarToolBase::GetBitmap2() const
{
return GetDisabledBitmap();
}
void wxToolBarToolBase::SetBitmap1(const wxBitmap& bmp)
{
SetNormalBitmap(bmp);
}
void wxToolBarToolBase::SetBitmap2(const wxBitmap& bmp)
{
SetDisabledBitmap(bmp);
}
#endif // WXWIN_COMPATIBILITY_2_2
// ----------------------------------------------------------------------------
// wxToolBarBase adding/deleting items
// ----------------------------------------------------------------------------

9
src/common/treebase.cpp
View File

@@ -86,14 +86,5 @@ wxTreeEvent::wxTreeEvent(const wxTreeEvent & event)
m_editCancelled = event.m_editCancelled;
}
#if WXWIN_COMPATIBILITY_2_2
int wxTreeEvent::GetCode() const
{
return m_evtKey.GetKeyCode();
}
#endif // WXWIN_COMPATIBILITY_2_2
#endif // wxUSE_TREECTRL

5
src/common/utilscmn.cpp
View File

@@ -98,11 +98,6 @@
// common data
// ----------------------------------------------------------------------------
#if WXWIN_COMPATIBILITY_2_2
const wxChar *wxInternalErrorStr = wxT("wxWidgets Internal Error");
const wxChar *wxFatalErrorStr = wxT("wxWidgets Fatal Error");
#endif // WXWIN_COMPATIBILITY_2_2
// ============================================================================
// implementation
// ============================================================================

9
src/generic/scrlwing.cpp
View File

@@ -940,15 +940,6 @@ void wxScrollHelper::GetViewStart (int *x, int *y) const
*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 )

9
src/generic/treectlg.cpp
View File

@@ -3635,13 +3635,4 @@ void wxGenericTreeCtrl::SetItemSelectedImage(const wxTreeItemId& item, int image
#endif // WXWIN_COMPATIBILITY_2_4
#if WXWIN_COMPATIBILITY_2_2
wxTreeItemId wxGenericTreeCtrl::GetParent(const wxTreeItemId& item) const
{
return GetItemParent( item );
}
#endif // WXWIN_COMPATIBILITY_2_2
#endif // wxUSE_TREECTRL

19
src/generic/wizard.cpp
View File

@@ -812,25 +812,6 @@ void wxWizard::OnWizEvent(wxWizardEvent& event)
}
}
// ----------------------------------------------------------------------------
// our public interface
// ----------------------------------------------------------------------------
#if WXWIN_COMPATIBILITY_2_2
/* static */
wxWizard *wxWizardBase::Create(wxWindow *parent,
int id,
const wxString& title,
const wxBitmap& bitmap,
const wxPoint& pos,
const wxSize& WXUNUSED(size))
{
return new wxWizard(parent, id, title, bitmap, pos);
}
#endif // WXWIN_COMPATIBILITY_2_2
// ----------------------------------------------------------------------------
// wxWizardEvent
// ----------------------------------------------------------------------------

19
src/gtk/radiobox.cpp
View File

@@ -658,23 +658,4 @@ wxRadioBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
return attr;
}
#if WXWIN_COMPATIBILITY_2_2
int wxRadioBox::Number() const
{
return GetCount();
}
wxString wxRadioBox::GetLabel(int n) const
{
return GetString(n);
}
void wxRadioBox::SetLabel( int item, const wxString& label )
{
SetString(item, label);
}
#endif // WXWIN_COMPATIBILITY_2_2
#endif // wxUSE_RADIOBOX

19
src/gtk1/radiobox.cpp
View File

@@ -658,23 +658,4 @@ wxRadioBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
return attr;
}
#if WXWIN_COMPATIBILITY_2_2
int wxRadioBox::Number() const
{
return GetCount();
}
wxString wxRadioBox::GetLabel(int n) const
{
return GetString(n);
}
void wxRadioBox::SetLabel( int item, const wxString& label )
{
SetString(item, label);
}
#endif // WXWIN_COMPATIBILITY_2_2
#endif // wxUSE_RADIOBOX

9
src/html/htmltag.cpp
View File

@@ -516,13 +516,4 @@ wxHtmlTag *wxHtmlTag::GetNextTag() const
return cur->m_Next;
}
#if WXWIN_COMPATIBILITY_2_2
bool wxHtmlTag::IsEnding() const
{
return false;
}
#endif // WXWIN_COMPATIBILITY_2_2
#endif

11
src/msdos/utilsdos.cpp
View File

@@ -207,17 +207,6 @@ wxChar *wxGetUserHome(const wxString& user)
return _T("");
}
#if WXWIN_COMPATIBILITY_2_2
void wxFatalError(const wxString &msg, const wxString &title)
{
wxFprintf( stderr, _("Error ") );
if (!title.IsNull()) wxFprintf( stderr, wxT("%s "), WXSTRINGCAST(title) );
if (!msg.IsNull()) wxFprintf( stderr, wxT(": %s"), WXSTRINGCAST(msg) );
wxFprintf( stderr, wxT(".\n") );
exit(3); // the same exit code as for abort()
}
#endif // WXWIN_COMPATIBILITY_2_2
// returns %UserName%, $USER or just "user"
//
bool wxGetUserId(wxChar *buf, int n)

9
src/msw/treectrl.cpp
View File

@@ -3243,14 +3243,5 @@ int wxTreeCtrl::GetState(const wxTreeItemId& node)
return STATEIMAGEMASKTOINDEX(tvi.state);
}
#if WXWIN_COMPATIBILITY_2_2
wxTreeItemId wxTreeCtrl::GetParent(const wxTreeItemId& item) const
{
return GetItemParent( item );
}
#endif // WXWIN_COMPATIBILITY_2_2
#endif // wxUSE_TREECTRL

9
src/os2/treectrl.cpp
View File

@@ -2124,13 +2124,4 @@ MRESULT wxTreeCtrl::OS2WindowProc (
return mRc;
} // end of wxTreeCtrl::OS2WindowProc
#if WXWIN_COMPATIBILITY_2_2
wxTreeItemId wxTreeCtrl::GetParent(const wxTreeItemId& item) const
{
return GetItemParent( item );
}
#endif // WXWIN_COMPATIBILITY_2_2
#endif // wxUSE_TREECTRL

56
src/os2/utils.cpp
View File

@@ -300,62 +300,6 @@ void wxFlushEvents()
// wxYield();
}
#if WXWIN_COMPATIBILITY_2_2
// Output a debug mess., in a system dependent fashion.
void wxDebugMsg(
const wxChar* zFmt ...
)
{
va_list vAp;
static wxChar zBuffer[512];
if (!wxTheApp->GetWantDebugOutput())
return ;
va_start(vAp, zFmt);
sprintf(zBuffer, zFmt, vAp) ;
va_end(vAp);
}
// Non-fatal error: pop up message box and (possibly) continue
void wxError(
const wxString& rMsg
, const wxString& rTitle
)
{
wxChar *wxBuffer = new wxChar[256];
wxSprintf(wxBuffer, "%s\nContinue?", WXSTRINGCAST rMsg);
if (::WinMessageBox( HWND_DESKTOP
,NULL
,(PSZ)wxBuffer
,(PSZ)WXSTRINGCAST rTitle
,0
,MB_ICONEXCLAMATION | MB_YESNO
) == MBID_YES)
delete[] wxBuffer;
wxExit();
}
// Fatal error: pop up message box and abort
void wxFatalError(
const wxString& rMsg
, const wxString& rTitle
)
{
unsigned long ulRc;
ulRc = ::WinMessageBox( HWND_DESKTOP
,NULL
,WXSTRINGCAST rMsg
,WXSTRINGCAST rTitle
,0
,MB_NOICON | MB_OK
);
DosExit(EXIT_PROCESS, ulRc);
}
#endif // WXWIN_COMPATIBILITY_2_2
// Emit a beeeeeep
void wxBell()
{

34
src/unix/utilsunx.cpp
View File

@@ -1070,40 +1070,6 @@ bool wxHandleFatalExceptions(bool doit)
#endif // wxUSE_ON_FATAL_EXCEPTION
// ----------------------------------------------------------------------------
// error and debug output routines (deprecated, use wxLog)
// ----------------------------------------------------------------------------
#if WXWIN_COMPATIBILITY_2_2
void wxDebugMsg( const char *format, ... )
{
va_list ap;
va_start( ap, format );
vfprintf( stderr, format, ap );
fflush( stderr );
va_end(ap);
}
void wxError( const wxString &msg, const wxString &title )
{
wxFprintf( stderr, _("Error ") );
if (!title.IsNull()) wxFprintf( stderr, wxT("%s "), WXSTRINGCAST(title) );
if (!msg.IsNull()) wxFprintf( stderr, wxT(": %s"), WXSTRINGCAST(msg) );
wxFprintf( stderr, wxT(".\n") );
}
void wxFatalError( const wxString &msg, const wxString &title )
{
wxFprintf( stderr, _("Error ") );
if (!title.IsNull()) wxFprintf( stderr, wxT("%s "), WXSTRINGCAST(title) );
if (!msg.IsNull()) wxFprintf( stderr, wxT(": %s"), WXSTRINGCAST(msg) );
wxFprintf( stderr, wxT(".\n") );
exit(3); // the same exit code as for abort()
}
#endif // WXWIN_COMPATIBILITY_2_2
#endif // wxUSE_BASE
#if wxUSE_GUI

15
utils/helpview/src/helpview.cpp
View File

@@ -301,22 +301,7 @@ void hvApp::MacOpenFile(const wxString& filename)
#define ART(artId, xpmRc) \
if ( id == artId ) return wxBitmap(xpmRc##_xpm);
// Compatibility hack to use wxApp::GetStdIcon of overriden by the user
#if WXWIN_COMPATIBILITY_2_2
#define GET_STD_ICON_FROM_APP(iconId) \
if ( client == wxART_MESSAGE_BOX ) \
{ \
wxIcon icon = wxTheApp->GetStdIcon(iconId); \
if ( icon.Ok() ) \
{ \
wxBitmap bmp; \
bmp.CopyFromIcon(icon); \
return bmp; \
} \
}
#else
#define GET_STD_ICON_FROM_APP(iconId)
#endif
// There are two ways of getting the standard icon: either via XPMs or via
// wxIcon ctor. This depends on the platform: