Patch #1183952, Create to return bool
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33633 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1507,7 +1507,7 @@ public:
|
||||
|
||||
#endif
|
||||
|
||||
void Create(wxWindow *parent, wxWindowID id=wxID_ANY,
|
||||
bool Create(wxWindow *parent, wxWindowID id=wxID_ANY,
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& size = wxDefaultSize, long style = 0,
|
||||
const wxString& name = wxSTCNameStr);
|
||||
|
@@ -150,7 +150,7 @@ wxStyledTextCtrl::wxStyledTextCtrl(wxWindow *parent,
|
||||
}
|
||||
|
||||
|
||||
void wxStyledTextCtrl::Create(wxWindow *parent,
|
||||
bool wxStyledTextCtrl::Create(wxWindow *parent,
|
||||
wxWindowID id,
|
||||
const wxPoint& pos,
|
||||
const wxSize& size,
|
||||
@@ -160,9 +160,10 @@ void wxStyledTextCtrl::Create(wxWindow *parent,
|
||||
#ifdef __WXMAC__
|
||||
style |= wxVSCROLL | wxHSCROLL;
|
||||
#endif
|
||||
wxControl::Create(parent, id, pos, size,
|
||||
if (!wxControl::Create(parent, id, pos, size,
|
||||
style | wxWANTS_CHARS | wxCLIP_CHILDREN,
|
||||
wxDefaultValidator, name);
|
||||
wxDefaultValidator, name))
|
||||
return false;
|
||||
|
||||
#ifdef LINK_LEXERS
|
||||
Scintilla_LinkLexers();
|
||||
@@ -181,6 +182,7 @@ void wxStyledTextCtrl::Create(wxWindow *parent,
|
||||
|
||||
// Reduces flicker on GTK+/X11
|
||||
SetBackgroundStyle(wxBG_STYLE_CUSTOM);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
|
@@ -150,7 +150,7 @@ wxStyledTextCtrl::wxStyledTextCtrl(wxWindow *parent,
|
||||
}
|
||||
|
||||
|
||||
void wxStyledTextCtrl::Create(wxWindow *parent,
|
||||
bool wxStyledTextCtrl::Create(wxWindow *parent,
|
||||
wxWindowID id,
|
||||
const wxPoint& pos,
|
||||
const wxSize& size,
|
||||
@@ -160,9 +160,10 @@ void wxStyledTextCtrl::Create(wxWindow *parent,
|
||||
#ifdef __WXMAC__
|
||||
style |= wxVSCROLL | wxHSCROLL;
|
||||
#endif
|
||||
wxControl::Create(parent, id, pos, size,
|
||||
if (!wxControl::Create(parent, id, pos, size,
|
||||
style | wxWANTS_CHARS | wxCLIP_CHILDREN,
|
||||
wxDefaultValidator, name);
|
||||
wxDefaultValidator, name))
|
||||
return false;
|
||||
|
||||
#ifdef LINK_LEXERS
|
||||
Scintilla_LinkLexers();
|
||||
@@ -181,6 +182,7 @@ void wxStyledTextCtrl::Create(wxWindow *parent,
|
||||
|
||||
// Reduces flicker on GTK+/X11
|
||||
SetBackgroundStyle(wxBG_STYLE_CUSTOM);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
|
@@ -102,7 +102,7 @@ public:
|
||||
|
||||
#endif
|
||||
|
||||
void Create(wxWindow *parent, wxWindowID id=wxID_ANY,
|
||||
bool Create(wxWindow *parent, wxWindowID id=wxID_ANY,
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& size = wxDefaultSize, long style = 0,
|
||||
const wxString& name = wxSTCNameStr);
|
||||
|
@@ -1507,7 +1507,7 @@ public:
|
||||
|
||||
#endif
|
||||
|
||||
void Create(wxWindow *parent, wxWindowID id=wxID_ANY,
|
||||
bool Create(wxWindow *parent, wxWindowID id=wxID_ANY,
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& size = wxDefaultSize, long style = 0,
|
||||
const wxString& name = wxSTCNameStr);
|
||||
|
@@ -150,7 +150,7 @@ wxStyledTextCtrl::wxStyledTextCtrl(wxWindow *parent,
|
||||
}
|
||||
|
||||
|
||||
void wxStyledTextCtrl::Create(wxWindow *parent,
|
||||
bool wxStyledTextCtrl::Create(wxWindow *parent,
|
||||
wxWindowID id,
|
||||
const wxPoint& pos,
|
||||
const wxSize& size,
|
||||
@@ -160,9 +160,10 @@ void wxStyledTextCtrl::Create(wxWindow *parent,
|
||||
#ifdef __WXMAC__
|
||||
style |= wxVSCROLL | wxHSCROLL;
|
||||
#endif
|
||||
wxControl::Create(parent, id, pos, size,
|
||||
if (!wxControl::Create(parent, id, pos, size,
|
||||
style | wxWANTS_CHARS | wxCLIP_CHILDREN,
|
||||
wxDefaultValidator, name);
|
||||
wxDefaultValidator, name))
|
||||
return false;
|
||||
|
||||
#ifdef LINK_LEXERS
|
||||
Scintilla_LinkLexers();
|
||||
@@ -181,6 +182,7 @@ void wxStyledTextCtrl::Create(wxWindow *parent,
|
||||
|
||||
// Reduces flicker on GTK+/X11
|
||||
SetBackgroundStyle(wxBG_STYLE_CUSTOM);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
|
@@ -150,7 +150,7 @@ wxStyledTextCtrl::wxStyledTextCtrl(wxWindow *parent,
|
||||
}
|
||||
|
||||
|
||||
void wxStyledTextCtrl::Create(wxWindow *parent,
|
||||
bool wxStyledTextCtrl::Create(wxWindow *parent,
|
||||
wxWindowID id,
|
||||
const wxPoint& pos,
|
||||
const wxSize& size,
|
||||
@@ -160,9 +160,10 @@ void wxStyledTextCtrl::Create(wxWindow *parent,
|
||||
#ifdef __WXMAC__
|
||||
style |= wxVSCROLL | wxHSCROLL;
|
||||
#endif
|
||||
wxControl::Create(parent, id, pos, size,
|
||||
if (!wxControl::Create(parent, id, pos, size,
|
||||
style | wxWANTS_CHARS | wxCLIP_CHILDREN,
|
||||
wxDefaultValidator, name);
|
||||
wxDefaultValidator, name))
|
||||
return false;
|
||||
|
||||
#ifdef LINK_LEXERS
|
||||
Scintilla_LinkLexers();
|
||||
@@ -181,6 +182,7 @@ void wxStyledTextCtrl::Create(wxWindow *parent,
|
||||
|
||||
// Reduces flicker on GTK+/X11
|
||||
SetBackgroundStyle(wxBG_STYLE_CUSTOM);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
|
@@ -102,7 +102,7 @@ public:
|
||||
|
||||
#endif
|
||||
|
||||
void Create(wxWindow *parent, wxWindowID id=wxID_ANY,
|
||||
bool Create(wxWindow *parent, wxWindowID id=wxID_ANY,
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& size = wxDefaultSize, long style = 0,
|
||||
const wxString& name = wxSTCNameStr);
|
||||
|
Reference in New Issue
Block a user