From 83a21afbcb5335b0f07fa4e2e1aaa1711c2b7dca Mon Sep 17 00:00:00 2001 From: Ove Kaaven Date: Fri, 16 Apr 1999 14:14:47 +0000 Subject: [PATCH] Some Unicode conversion. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2199 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/generic/fontdlgg.h | 12 ++++++------ include/wx/generic/msgdlgg.h | 2 +- include/wx/prop.h | 30 +++++++++++++++--------------- include/wx/proplist.h | 2 +- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/include/wx/generic/fontdlgg.h b/include/wx/generic/fontdlgg.h index ade8d40404..a32deeaffd 100644 --- a/include/wx/generic/fontdlgg.h +++ b/include/wx/generic/fontdlgg.h @@ -85,11 +85,11 @@ class WXDLLEXPORT wxGenericFontDialog: public wxDialog DECLARE_EVENT_TABLE() }; -char WXDLLEXPORT *wxFontFamilyIntToString(int family); -char WXDLLEXPORT *wxFontWeightIntToString(int weight); -char WXDLLEXPORT *wxFontStyleIntToString(int style); -int WXDLLEXPORT wxFontFamilyStringToInt(char *family); -int WXDLLEXPORT wxFontWeightStringToInt(char *weight); -int WXDLLEXPORT wxFontStyleStringToInt(char *style); +wxChar WXDLLEXPORT *wxFontFamilyIntToString(int family); +wxChar WXDLLEXPORT *wxFontWeightIntToString(int weight); +wxChar WXDLLEXPORT *wxFontStyleIntToString(int style); +int WXDLLEXPORT wxFontFamilyStringToInt(wxChar *family); +int WXDLLEXPORT wxFontWeightStringToInt(wxChar *weight); +int WXDLLEXPORT wxFontStyleStringToInt(wxChar *style); #endif diff --git a/include/wx/generic/msgdlgg.h b/include/wx/generic/msgdlgg.h index c9f3778037..6f7401a217 100644 --- a/include/wx/generic/msgdlgg.h +++ b/include/wx/generic/msgdlgg.h @@ -22,7 +22,7 @@ // type is an 'or' (|) of wxOK, wxCANCEL, wxYES_NO // Returns wxYES/NO/OK/CANCEL -WXDLLEXPORT_DATA(extern const char*) wxMessageBoxCaptionStr; +WXDLLEXPORT_DATA(extern const wxChar*) wxMessageBoxCaptionStr; class WXDLLEXPORT wxGenericMessageDialog: public wxDialog { diff --git a/include/wx/prop.h b/include/wx/prop.h index c933e4e72d..9afa515b19 100644 --- a/include/wx/prop.h +++ b/include/wx/prop.h @@ -141,14 +141,14 @@ class WXDLLEXPORT wxPropertyValidator: public wxEvtHandler inline void SetValidatorProperty(wxProperty *prop) { m_validatorProperty = prop; } inline wxProperty *GetValidatorProperty(void) const { return m_validatorProperty; } - virtual bool StringToFloat (char *s, float *number); - virtual bool StringToDouble (char *s, double *number); - virtual bool StringToInt (char *s, int *number); - virtual bool StringToLong (char *s, long *number); - virtual char *FloatToString (float number); - virtual char *DoubleToString (double number); - virtual char *IntToString (int number); - virtual char *LongToString (long number); + virtual bool StringToFloat (wxChar *s, float *number); + virtual bool StringToDouble (wxChar *s, double *number); + virtual bool StringToInt (wxChar *s, int *number); + virtual bool StringToLong (wxChar *s, long *number); + virtual wxChar *FloatToString (float number); + virtual wxChar *DoubleToString (double number); + virtual wxChar *IntToString (int number); + virtual wxChar *LongToString (long number); protected: long m_validatorFlags; @@ -193,7 +193,7 @@ class WXDLLEXPORT wxPropertyValue: public wxObject wxPropertyValue(void); // Unknown type wxPropertyValue(const wxPropertyValue& copyFrom); // Copy constructor - wxPropertyValue(const char *val); + wxPropertyValue(const wxChar *val); wxPropertyValue(const wxString& val); wxPropertyValue(long val); wxPropertyValue(bool val); @@ -202,7 +202,7 @@ class WXDLLEXPORT wxPropertyValue: public wxObject wxPropertyValue(wxList *val); wxPropertyValue(wxStringList *val); // Pointer versions - wxPropertyValue(char **val); + wxPropertyValue(wxChar **val); wxPropertyValue(long *val); wxPropertyValue(bool *val); wxPropertyValue(float *val); @@ -214,11 +214,11 @@ class WXDLLEXPORT wxPropertyValue: public wxObject virtual long IntegerValue(void) const; virtual float RealValue(void) const; virtual bool BoolValue(void) const; - virtual char *StringValue(void) const; + virtual wxChar *StringValue(void) const; virtual long *IntegerValuePtr(void) const; virtual float *RealValuePtr(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) 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 bool val); void operator=(const float val); - void operator=(const char **val); + void operator=(const wxChar **val); void operator=(const long *val); void operator=(const bool *val); void operator=(const float *val); @@ -284,11 +284,11 @@ class WXDLLEXPORT wxPropertyValue: public wxObject union { long integer; // Also doubles as bool - char *string; + wxChar *string; float real; long *integerPtr; bool *boolPtr; - char **stringPtr; + wxChar **stringPtr; float *realPtr; wxPropertyValue *first; // If is a list expr, points to the first node } m_value; diff --git a/include/wx/proplist.h b/include/wx/proplist.h index a3c6a5e24f..87a674b2a1 100644 --- a/include/wx/proplist.h +++ b/include/wx/proplist.h @@ -551,7 +551,7 @@ class WXDLLEXPORT wxListOfStringsListValidator: public wxPropertyListValidator // Called when the property is double clicked. 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. void OnEdit(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow); -- 2.47.2