Lots of Unix/Unicode compile fixes, some of which
are just #ifdef 0 such as the wxExecute calls in gdcps.cpp. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16375 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -48,6 +48,10 @@ public:
|
||||
// Implicit conversion from the colour name
|
||||
wxColour( const wxString &colourName ) { InitFromName(colourName); }
|
||||
wxColour( const char *colourName ) { InitFromName(colourName); }
|
||||
#if wxUSE_UNICODE
|
||||
wxColour( const wxChar *colourName ) { InitFromName( wxString(colourName) ); }
|
||||
#endif
|
||||
|
||||
|
||||
wxColour( const wxColour& col )
|
||||
: wxGDIObject()
|
||||
|
@@ -33,7 +33,7 @@ class wxComboBox;
|
||||
// global data
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
extern const char* wxComboBoxNameStr;
|
||||
extern const wxChar* wxComboBoxNameStr;
|
||||
extern const wxChar* wxEmptyString;
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
@@ -33,7 +33,7 @@ class wxGauge;
|
||||
// global data
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
extern const char* wxGaugeNameStr;
|
||||
extern const wxChar* wxGaugeNameStr;
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// wxGaugeBox
|
||||
|
@@ -39,14 +39,14 @@ public:
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& size = wxDefaultSize,
|
||||
long style = 0,
|
||||
const wxString& name = "notebook");
|
||||
const wxString& name = wxT("notebook"));
|
||||
// Create() function
|
||||
bool Create(wxWindow *parent,
|
||||
wxWindowID id,
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& size = wxDefaultSize,
|
||||
long style = 0,
|
||||
const wxString& name = "notebook");
|
||||
const wxString& name = wxT("notebook"));
|
||||
// dtor
|
||||
virtual ~wxNotebook();
|
||||
|
||||
|
@@ -59,8 +59,6 @@ public:
|
||||
virtual int GetMax() const;
|
||||
|
||||
// implementation
|
||||
// --------------
|
||||
|
||||
void OnChar( wxKeyEvent &event );
|
||||
|
||||
bool IsOwnGtkWindow( GdkWindow *window );
|
||||
|
Reference in New Issue
Block a user