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

Some Unicode conversion.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2199 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ove Kaaven
1999-04-16 14:14:47 +00:00
parent 3727898455
commit 83a21afbcb
4 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/wx/generic/fontdlgg.h
View File

@@ -85,11 +85,11 @@ class WXDLLEXPORT wxGenericFontDialog: public wxDialog
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };
char WXDLLEXPORT *wxFontFamilyIntToString(int family); wxChar WXDLLEXPORT *wxFontFamilyIntToString(int family);
char WXDLLEXPORT *wxFontWeightIntToString(int weight); wxChar WXDLLEXPORT *wxFontWeightIntToString(int weight);
char WXDLLEXPORT *wxFontStyleIntToString(int style); wxChar WXDLLEXPORT *wxFontStyleIntToString(int style);
int WXDLLEXPORT wxFontFamilyStringToInt(char *family); int WXDLLEXPORT wxFontFamilyStringToInt(wxChar *family);
int WXDLLEXPORT wxFontWeightStringToInt(char *weight); int WXDLLEXPORT wxFontWeightStringToInt(wxChar *weight);
int WXDLLEXPORT wxFontStyleStringToInt(char *style); int WXDLLEXPORT wxFontStyleStringToInt(wxChar *style);
#endif #endif

2
include/wx/generic/msgdlgg.h
View File

@@ -22,7 +22,7 @@
// type is an 'or' (|) of wxOK, wxCANCEL, wxYES_NO // type is an 'or' (|) of wxOK, wxCANCEL, wxYES_NO
// Returns wxYES/NO/OK/CANCEL // Returns wxYES/NO/OK/CANCEL
WXDLLEXPORT_DATA(extern const char*) wxMessageBoxCaptionStr; WXDLLEXPORT_DATA(extern const wxChar*) wxMessageBoxCaptionStr;
class WXDLLEXPORT wxGenericMessageDialog: public wxDialog class WXDLLEXPORT wxGenericMessageDialog: public wxDialog
{ {

30
include/wx/prop.h
View File

@@ -141,14 +141,14 @@ class WXDLLEXPORT wxPropertyValidator: public wxEvtHandler
inline void SetValidatorProperty(wxProperty *prop) { m_validatorProperty = prop; } inline void SetValidatorProperty(wxProperty *prop) { m_validatorProperty = prop; }
inline wxProperty *GetValidatorProperty(void) const { return m_validatorProperty; } inline wxProperty *GetValidatorProperty(void) const { return m_validatorProperty; }
virtual bool StringToFloat (char *s, float *number); virtual bool StringToFloat (wxChar *s, float *number);
virtual bool StringToDouble (char *s, double *number); virtual bool StringToDouble (wxChar *s, double *number);
virtual bool StringToInt (char *s, int *number); virtual bool StringToInt (wxChar *s, int *number);
virtual bool StringToLong (char *s, long *number); virtual bool StringToLong (wxChar *s, long *number);
virtual char *FloatToString (float number); virtual wxChar *FloatToString (float number);
virtual char *DoubleToString (double number); virtual wxChar *DoubleToString (double number);
virtual char *IntToString (int number); virtual wxChar *IntToString (int number);
virtual char *LongToString (long number); virtual wxChar *LongToString (long number);
protected: protected:
long m_validatorFlags; long m_validatorFlags;
@@ -193,7 +193,7 @@ class WXDLLEXPORT wxPropertyValue: public wxObject
wxPropertyValue(void); // Unknown type wxPropertyValue(void); // Unknown type
wxPropertyValue(const wxPropertyValue& copyFrom); // Copy constructor wxPropertyValue(const wxPropertyValue& copyFrom); // Copy constructor
wxPropertyValue(const char *val); wxPropertyValue(const wxChar *val);
wxPropertyValue(const wxString& val); wxPropertyValue(const wxString& val);
wxPropertyValue(long val); wxPropertyValue(long val);
wxPropertyValue(bool val); wxPropertyValue(bool val);
@@ -202,7 +202,7 @@ class WXDLLEXPORT wxPropertyValue: public wxObject
wxPropertyValue(wxList *val); wxPropertyValue(wxList *val);
wxPropertyValue(wxStringList *val); wxPropertyValue(wxStringList *val);
// Pointer versions // Pointer versions
wxPropertyValue(char **val); wxPropertyValue(wxChar **val);
wxPropertyValue(long *val); wxPropertyValue(long *val);
wxPropertyValue(bool *val); wxPropertyValue(bool *val);
wxPropertyValue(float *val); wxPropertyValue(float *val);
@@ -214,11 +214,11 @@ class WXDLLEXPORT wxPropertyValue: public wxObject
virtual long IntegerValue(void) const; virtual long IntegerValue(void) const;
virtual float RealValue(void) const; virtual float RealValue(void) const;
virtual bool BoolValue(void) const; virtual bool BoolValue(void) const;
virtual char *StringValue(void) const; virtual wxChar *StringValue(void) const;
virtual long *IntegerValuePtr(void) const; virtual long *IntegerValuePtr(void) const;
virtual float *RealValuePtr(void) const; virtual float *RealValuePtr(void) const;
virtual bool *BoolValuePtr(void) const; virtual bool *BoolValuePtr(void) const;
virtual char **StringValuePtr(void) const; virtual wxChar **StringValuePtr(void) const;
// Get nth arg of clause (starting from 1) // Get nth arg of clause (starting from 1)
virtual wxPropertyValue *Arg(wxPropertyValueType type, int arg) const; virtual wxPropertyValue *Arg(wxPropertyValueType type, int arg) const;
@@ -272,7 +272,7 @@ class WXDLLEXPORT wxPropertyValue: public wxObject
void operator=(const long val); void operator=(const long val);
void operator=(const bool val); void operator=(const bool val);
void operator=(const float val); void operator=(const float val);
void operator=(const char **val); void operator=(const wxChar **val);
void operator=(const long *val); void operator=(const long *val);
void operator=(const bool *val); void operator=(const bool *val);
void operator=(const float *val); void operator=(const float *val);
@@ -284,11 +284,11 @@ class WXDLLEXPORT wxPropertyValue: public wxObject
union { union {
long integer; // Also doubles as bool long integer; // Also doubles as bool
char *string; wxChar *string;
float real; float real;
long *integerPtr; long *integerPtr;
bool *boolPtr; bool *boolPtr;
char **stringPtr; wxChar **stringPtr;
float *realPtr; float *realPtr;
wxPropertyValue *first; // If is a list expr, points to the first node wxPropertyValue *first; // If is a list expr, points to the first node
} m_value; } m_value;

2
include/wx/proplist.h
View File

@@ -551,7 +551,7 @@ class WXDLLEXPORT wxListOfStringsListValidator: public wxPropertyListValidator
// Called when the property is double clicked. // Called when the property is double clicked.
bool OnDoubleClick(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow); bool OnDoubleClick(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
bool EditStringList(wxWindow *parent, wxStringList *stringList, const char *title = "String List Editor"); bool EditStringList(wxWindow *parent, wxStringList *stringList, const wxChar *title = _T("String List Editor"));
// Called when the edit (...) button is pressed. // Called when the edit (...) button is pressed.
void OnEdit(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow); void OnEdit(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);