AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Old API deprecated. Use new and remove old usage where necessary.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31305 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba 2005-01-10 17:21:16 +00:00
parent e896726a47
commit eecb33b018
9 changed files with 289 additions and 319 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/wx/app.h
View File

@ -206,12 +206,12 @@ public:
// user-defined class (default implementation creates a wxLogGui
// object) -- this log object is used by default by all wxLogXXX()
// functions.
virtual wxLog *CreateLogTarget();
wxDEPRECATED( virtual wxLog *CreateLogTarget() );
#endif // wxUSE_LOG
// similar to CreateLogTarget() but for the global wxMessageOutput
// object
virtual wxMessageOutput *CreateMessageOutput();
wxDEPRECATED( virtual wxMessageOutput *CreateMessageOutput() );
#endif // WXWIN_COMPATIBILITY_2_4
@ -278,10 +278,7 @@ public:
static bool CheckBuildOptions(const char *optionsSignature,
const char *componentName);
#if WXWIN_COMPATIBILITY_2_4
static bool CheckBuildOptions(const wxBuildOptions& buildOptions)
{
return CheckBuildOptions(buildOptions.m_signature, "your program");
}
wxDEPRECATED( static bool CheckBuildOptions(const wxBuildOptions& buildOptions) );
#endif
// implementation only from now on

4
include/wx/arrstr.h
View File

@ -160,7 +160,7 @@ public:
// once you are done with it. Will return NULL if the
// ArrayString was empty.
#if WXWIN_COMPATIBILITY_2_4
wxString* GetStringArray() const;
wxDEPRECATED( wxString* GetStringArray() const );
#endif
// item management
@ -180,7 +180,7 @@ public:
void Remove(const wxChar *sz);
// remove item by index
#if WXWIN_COMPATIBILITY_2_4
void Remove(size_t nIndex, size_t nRemove = 1) { RemoveAt(nIndex, nRemove); }
wxDEPRECATED( void Remove(size_t nIndex, size_t nRemove = 1) );
#endif
void RemoveAt(size_t nIndex, size_t nRemove = 1);

4
include/wx/filedlg.h
View File

@ -84,9 +84,9 @@ public:
// The arrays will contain an equal number of items found before the error.
// wildCard is in the form:
// "All files (*)|*|Image Files (*.jpeg *.png)|*.jpg;*.png"
static int ParseWildcard(const wxString& wildCard,
wxDEPRECATED( static int ParseWildcard(const wxString& wildCard,
wxArrayString& descriptions,
wxArrayString& filters);
wxArrayString& filters) );
#endif // WXWIN_COMPATIBILITY_2_4
// Append first extension to filePath from a ';' separated extensionList

47
include/wx/palmos/treectrl.h
View File

@ -27,12 +27,6 @@
#include "wx/treebase.h"
#include "wx/hashmap.h"
#ifdef __GNUWIN32__
// Cygwin windows.h defines these identifiers
#undef GetFirstChild
#undef GetNextSibling
#endif // Cygwin
// fwd decl
class WXDLLEXPORT wxImageList;
class WXDLLEXPORT wxDragImage;
@ -363,42 +357,6 @@ public:
wxRect& rect,
bool textOnly = false) const;
// deprecated
// ----------
#if WXWIN_COMPATIBILITY_2_4
// these methods are deprecated and will be removed in future versions of
// wxWidgets, they're here for compatibility only, don't use them in new
// code (the comments indicate why these methods are now useless and how to
// replace them)
// use Expand, Collapse, CollapseAndReset or Toggle
wxDEPRECATED( void ExpandItem(const wxTreeItemId& item, int action) );
// use AddRoot, PrependItem or AppendItem
wxDEPRECATED( wxTreeItemId InsertItem(const wxTreeItemId& parent,
const wxString& text,
int image = -1, int selImage = -1,
long insertAfter = wxTREE_INSERT_LAST) );
// use Set/GetImageList and Set/GetStateImageList
wxImageList *GetImageList(int) const { return GetImageList(); }
void SetImageList(wxImageList *imageList, int) { SetImageList(imageList); }
// use Set/GetItemImage directly
int GetItemSelectedImage(const wxTreeItemId& item) const
{ return GetItemImage(item, wxTreeItemIcon_Selected); }
void SetItemSelectedImage(const wxTreeItemId& item, int image)
{ SetItemImage(item, image, wxTreeItemIcon_Selected); }
// use the versions taking wxTreeItemIdValue cookies
wxDEPRECATED( wxTreeItemId GetFirstChild(const wxTreeItemId& item,
long& cookie) const );
wxDEPRECATED( wxTreeItemId GetNextChild(const wxTreeItemId& item,
long& cookie) const );
#endif // WXWIN_COMPATIBILITY_2_4
// implementation
// --------------
@ -462,7 +420,7 @@ private:
void DeleteTextCtrl();
// support for additional item images which we implement using
// wxTreeItemIndirectData technique - see the comments in msw/treectrl.cpp
// wxTreeItemIndirectData technique
void SetIndirectItemData(const wxTreeItemId& item,
class wxTreeItemIndirectData *data);
bool HasIndirectData(const wxTreeItemId& item) const;
@ -493,5 +451,4 @@ private:
#endif // wxUSE_TREECTRL
#endif
// _WX_TREECTRL_H_
#endif // _WX_TREECTRL_H_

18
include/wx/utils.h
View File

@ -79,7 +79,7 @@ class WXDLLIMPEXP_CORE wxPoint;
// Make a copy of this string using 'new'
#if WXWIN_COMPATIBILITY_2_4
WXDLLIMPEXP_BASE wxChar* copystring(const wxChar *s);
wxDEPRECATED( WXDLLIMPEXP_BASE wxChar* copystring(const wxChar *s) );
#endif
// A shorter way of using strcmp
@ -146,14 +146,14 @@ WXDLLEXPORT long wxGetCurrentId();
WXDLLIMPEXP_DATA_BASE(extern const wxChar*) wxFloatToStringStr;
WXDLLIMPEXP_DATA_BASE(extern const wxChar*) wxDoubleToStringStr;
WXDLLIMPEXP_BASE void StringToFloat(const wxChar *s, float *number);
WXDLLIMPEXP_BASE wxChar* FloatToString(float number, const wxChar *fmt = wxFloatToStringStr);
WXDLLIMPEXP_BASE void StringToDouble(const wxChar *s, double *number);
WXDLLIMPEXP_BASE wxChar* DoubleToString(double number, const wxChar *fmt = wxDoubleToStringStr);
WXDLLIMPEXP_BASE void StringToInt(const wxChar *s, int *number);
WXDLLIMPEXP_BASE void StringToLong(const wxChar *s, long *number);
WXDLLIMPEXP_BASE wxChar* IntToString(int number);
WXDLLIMPEXP_BASE wxChar* LongToString(long number);
wxDEPRECATED( WXDLLIMPEXP_BASE void StringToFloat(const wxChar *s, float *number) );
wxDEPRECATED( WXDLLIMPEXP_BASE wxChar* FloatToString(float number, const wxChar *fmt = wxFloatToStringStr) );
wxDEPRECATED( WXDLLIMPEXP_BASE void StringToDouble(const wxChar *s, double *number) );
wxDEPRECATED( WXDLLIMPEXP_BASE wxChar* DoubleToString(double number, const wxChar *fmt = wxDoubleToStringStr) );
wxDEPRECATED( WXDLLIMPEXP_BASE void StringToInt(const wxChar *s, int *number) );
wxDEPRECATED( WXDLLIMPEXP_BASE void StringToLong(const wxChar *s, long *number) );
wxDEPRECATED( WXDLLIMPEXP_BASE wxChar* IntToString(int number) );
wxDEPRECATED( WXDLLIMPEXP_BASE wxChar* LongToString(long number) );
#endif // WXWIN_COMPATIBILITY_2_4

9
src/common/appbase.cpp
View File

@ -442,6 +442,15 @@ void wxAppConsole::OnAssert(const wxChar *file,
#endif // __WXDEBUG__
#if WXWIN_COMPATIBILITY_2_4
bool wxAppConsole::CheckBuildOptions(const wxBuildOptions& buildOptions)
{
return CheckBuildOptions(buildOptions.m_signature, "your program");
}
#endif
// ============================================================================
// other classes implementations
// ============================================================================

7
src/common/string.cpp
View File

@ -1629,7 +1629,7 @@ inline int wxSafeIsspace(wxChar ch) { return (ch < 127) && wxIsspace(ch); }
wxString& wxString::Trim(bool bFromRight)
{
// first check if we're going to modify the string at all
if ( !IsEmpty() &&
if ( !empty() &&
(
(bFromRight && wxSafeIsspace(GetChar(Len() - 1))) ||
(!bFromRight && wxSafeIsspace(GetChar(0u)))
@ -2195,6 +2195,11 @@ wxString* wxArrayString::GetStringArray() const
return array;
}
void wxArrayString::Remove(size_t nIndex, size_t nRemove)
{
RemoveAt(nIndex, nRemove);
}
#endif // WXWIN_COMPATIBILITY_2_4
// searches the array for an item (forward or backwards)

6
src/palmos/treectrl.cpp
View File

@ -32,18 +32,12 @@
#include "wx/palmos/private.h"
// Set this to 1 to be _absolutely_ sure that repainting will work for all
// comctl32.dll versions
#define wxUSE_COMCTL32_SAFELY 0
#include "wx/app.h"
#include "wx/log.h"
#include "wx/dynarray.h"
#include "wx/imaglist.h"
#include "wx/settings.h"
#include "wx/palmos/wrapcctl.h"
// macros to hide the cast ugliness
// --------------------------------

42
utils/tex2rtf/src/texutils.cpp
View File

@ -47,11 +47,6 @@ using namespace std;
#if !WXWIN_COMPATIBILITY_2_4
static inline wxChar* copystring(const wxChar* s)
{ return wxStrcpy(new wxChar[wxStrlen(s) + 1], s); }
static inline void StringToInt (const wxChar *s, int *number)
{
if (s && *s && number)
*number = (int) wxStrtol (s, (wxChar **) NULL, 10);
}
#endif
wxHashTable TexReferences(wxKEY_STRING);
@ -1103,9 +1098,21 @@ bool StringTobool(wxChar *val)
return false;
}
void RegisterIntSetting (const wxString& s, int *number)
{
if (number)
{
long val;
s.ToLong(&val);
*number = (int)val;
}
}
// Define a variable value from the .ini file
wxChar *RegisterSetting(wxChar *settingName, wxChar *settingValue, bool interactive)
{
wxString settingValueStr( settingValue );
static wxChar errorCode[100];
wxStrcpy(errorCode, _T("OK"));
if (StringMatch(settingName, _T("chapterName"), false, true))
@ -1174,15 +1181,15 @@ wxChar *RegisterSetting(wxChar *settingName, wxChar *settingValue, bool interact
AbstractNameString = copystring(settingValue);
}
else if (StringMatch(settingName, _T("chapterFontSize"), false, true))
StringToInt(settingValue, &chapterFont);
RegisterIntSetting(settingValueStr, &chapterFont);
else if (StringMatch(settingName, _T("sectionFontSize"), false, true))
StringToInt(settingValue, &sectionFont);
RegisterIntSetting(settingValueStr, &sectionFont);
else if (StringMatch(settingName, _T("subsectionFontSize"), false, true))
StringToInt(settingValue, &subsectionFont);
RegisterIntSetting(settingValueStr, &subsectionFont);
else if (StringMatch(settingName, _T("titleFontSize"), false, true))
StringToInt(settingValue, &titleFont);
RegisterIntSetting(settingValueStr, &titleFont);
else if (StringMatch(settingName, _T("authorFontSize"), false, true))
StringToInt(settingValue, &authorFont);
RegisterIntSetting(settingValueStr, &authorFont);
else if (StringMatch(settingName, _T("ignoreInput"), false, true))
IgnorableInputFiles.Add(wxFileNameFromPath(settingValue));
else if (StringMatch(settingName, _T("mirrorMargins"), false, true))
@ -1198,9 +1205,9 @@ wxChar *RegisterSetting(wxChar *settingName, wxChar *settingValue, bool interact
else if (StringMatch(settingName, _T("combineSubSections"), false, true))
combineSubSections = StringTobool(settingValue);
else if (StringMatch(settingName, _T("listLabelIndent"), false, true))
StringToInt(settingValue, &labelIndentTab);
RegisterIntSetting(settingValueStr, &labelIndentTab);
else if (StringMatch(settingName, _T("listItemIndent"), false, true))
StringToInt(settingValue, &itemIndentTab);
RegisterIntSetting(settingValueStr, &itemIndentTab);
else if (StringMatch(settingName, _T("useUpButton"), false, true))
useUpButton = StringTobool(settingValue);
else if (StringMatch(settingName, _T("useHeadingStyles"), false, true))
@ -1208,13 +1215,13 @@ wxChar *RegisterSetting(wxChar *settingName, wxChar *settingValue, bool interact
else if (StringMatch(settingName, _T("useWord"), false, true))
useWord = StringTobool(settingValue);
else if (StringMatch(settingName, _T("contentsDepth"), false, true))
StringToInt(settingValue, &contentsDepth);
RegisterIntSetting(settingValueStr, &contentsDepth);
else if (StringMatch(settingName, _T("generateHPJ"), false, true))
generateHPJ = StringTobool(settingValue);
else if (StringMatch(settingName, _T("truncateFilenames"), false, true))
truncateFilenames = StringTobool(settingValue);
else if (StringMatch(settingName, _T("winHelpVersion"), false, true))
StringToInt(settingValue, &winHelpVersion);
RegisterIntSetting(settingValueStr, &winHelpVersion);
else if (StringMatch(settingName, _T("winHelpContents"), false, true))
winHelpContents = StringTobool(settingValue);
else if (StringMatch(settingName, _T("htmlIndex"), false, true))
@ -1225,7 +1232,8 @@ wxChar *RegisterSetting(wxChar *settingName, wxChar *settingValue, bool interact
htmlFrameContents = StringTobool(settingValue);
else if (StringMatch(settingName, _T("htmlStylesheet"), false, true))
{
if (htmlStylesheet) delete[] htmlStylesheet;
if (htmlStylesheet)
delete[] htmlStylesheet;
htmlStylesheet = copystring(settingValue);
}
else if (StringMatch(settingName, _T("upperCaseNames"), false, true))
@ -1249,7 +1257,7 @@ wxChar *RegisterSetting(wxChar *settingName, wxChar *settingValue, bool interact
compatibilityMode = StringTobool(settingValue);
else if (StringMatch(settingName, _T("defaultColumnWidth"), false, true))
{
StringToInt(settingValue, &defaultTableColumnWidth);
RegisterIntSetting(settingValueStr, &defaultTableColumnWidth);
defaultTableColumnWidth = 20*defaultTableColumnWidth;
}
else if (StringMatch(settingName, _T("bitmapMethod"), false, true))
@ -1332,7 +1340,7 @@ wxChar *RegisterSetting(wxChar *settingName, wxChar *settingValue, bool interact
else if (StringMatch(settingName, _T("documentFontSize"), false, true))
{
int n;
StringToInt(settingValue, &n);
RegisterIntSetting(settingValueStr, &n);
if (n == 10 || n == 11 || n == 12)
SetFontSizes(n);
else