projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use at most -O1 with BCC, it is broken and cannot correctly compile this file with -O2
[wxWidgets.git]
/
src
/
mac
/
stattext.cpp
diff --git
a/src/mac/stattext.cpp
b/src/mac/stattext.cpp
index b2a7d103da4694cb0a3837cf72c7a4d009193e86..2d81d33b16655270647a48e9d3640f7784e72291 100644
(file)
--- a/
src/mac/stattext.cpp
+++ b/
src/mac/stattext.cpp
@@
-41,22
+41,17
@@
bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
long style,
const wxString& name)
{
long style,
const wxString& name)
{
- SetName(name);
- m_backgroundColour = parent->GetBackgroundColour() ;
- m_foregroundColour = parent->GetForegroundColour() ;
-
- if ( id == -1 )
- m_windowId = (int)NewControlId();
- else
- m_windowId = id;
-
- m_windowStyle = style;
m_label = wxStripMenuCodes(label) ;
m_label = wxStripMenuCodes(label) ;
- bool ret = wxControl::Create( parent, id, pos, size, style , wxDefaultValidator , name );
+ if ( !wxControl::Create( parent, id, pos, size, style,
+ wxDefaultValidator , name ) )
+ {
+ return false;
+ }
+
SetBestSize( size ) ;
SetBestSize( size ) ;
- return
ret
;
+ return
true
;
}
const wxString punct = wxT(" ,.-;:!?");
}
const wxString punct = wxT(" ,.-;:!?");