removed GetString(), it doesn't belong here
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13959 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -130,14 +130,6 @@ enum wxSystemFeature
|
|||||||
wxSYS_CAN_ICONIZE_FRAME
|
wxSYS_CAN_ICONIZE_FRAME
|
||||||
};
|
};
|
||||||
|
|
||||||
// values for wxSystemSettings::GetString
|
|
||||||
enum wxSystemString
|
|
||||||
{
|
|
||||||
wxSYS_DECIMAL_SEPARATOR = 1,
|
|
||||||
wxSYS_LIST_SEPARATOR,
|
|
||||||
wxSYS_LEADING_ZERO
|
|
||||||
};
|
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
// wxSystemSettingsNative: defines the API for wxSystemSettings class
|
// wxSystemSettingsNative: defines the API for wxSystemSettings class
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
@@ -163,12 +155,6 @@ public:
|
|||||||
|
|
||||||
// return true if the port has certain feature
|
// return true if the port has certain feature
|
||||||
static bool HasFeature(wxSystemFeature index);
|
static bool HasFeature(wxSystemFeature index);
|
||||||
|
|
||||||
// Windows-only for now
|
|
||||||
#ifdef __WXMSW__
|
|
||||||
// Get a system string, e. g. decimal separator
|
|
||||||
static wxString GetString(int index);
|
|
||||||
#endif
|
|
||||||
};
|
};
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
@@ -353,41 +353,6 @@ int wxSystemSettingsNative::GetMetric(wxSystemMetric index)
|
|||||||
#endif // __WXMICROWIN__/!__WXMICROWIN__
|
#endif // __WXMICROWIN__/!__WXMICROWIN__
|
||||||
}
|
}
|
||||||
|
|
||||||
wxString wxSystemSettingsNative::GetString(int index)
|
|
||||||
{
|
|
||||||
wxString str;
|
|
||||||
wxChar buffer[256];
|
|
||||||
size_t count;
|
|
||||||
buffer[0] = wxT('\0');
|
|
||||||
switch (index)
|
|
||||||
{
|
|
||||||
case wxSYS_DECIMAL_SEPARATOR:
|
|
||||||
count = ::GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, buffer, 256);
|
|
||||||
if (!count)
|
|
||||||
str << ".";
|
|
||||||
else
|
|
||||||
str << buffer;
|
|
||||||
break;
|
|
||||||
case wxSYS_LIST_SEPARATOR:
|
|
||||||
count = ::GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SLIST, buffer, 256);
|
|
||||||
if (!count)
|
|
||||||
str << ",";
|
|
||||||
else
|
|
||||||
str << buffer;
|
|
||||||
break;
|
|
||||||
case wxSYS_LEADING_ZERO: // 0 means no leading zero, 1 means leading zero
|
|
||||||
count = ::GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_ILZERO, buffer, 256);
|
|
||||||
if (!count)
|
|
||||||
str << "0";
|
|
||||||
else
|
|
||||||
str << buffer;
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
wxFAIL_MSG("Unknown System String !");
|
|
||||||
}
|
|
||||||
return str;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool wxSystemSettingsNative::HasFeature(wxSystemFeature index)
|
bool wxSystemSettingsNative::HasFeature(wxSystemFeature index)
|
||||||
{
|
{
|
||||||
switch ( index )
|
switch ( index )
|
||||||
|
Reference in New Issue
Block a user