projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove miniframe stuff from GtkOnSize(), it's handled by wxFrame
[wxWidgets.git]
/
src
/
msw
/
control.cpp
diff --git
a/src/msw/control.cpp
b/src/msw/control.cpp
index 05370f450576cc0bd27a51809b9361e85ee6dd4c..54fd80129e90f585004794496391bf0bca7f8156 100644
(file)
--- a/
src/msw/control.cpp
+++ b/
src/msw/control.cpp
@@
-162,6
+162,10
@@
bool wxControl::MSWCreateControl(const wxChar *classname,
return false;
}
return false;
}
+ // saving the label in m_labelOrig to return it verbatim
+ // later in GetLabel()
+ m_labelOrig = label;
+
// install wxWidgets window proc for this window
SubclassWin(m_hWnd);
// install wxWidgets window proc for this window
SubclassWin(m_hWnd);
@@
-187,7
+191,7
@@
bool wxControl::MSWCreateControl(const wxChar *classname,
#if wxUSE_TREECTRL
if ( wxDynamicCastThis(wxTreeCtrl) )
testFont = true;
#if wxUSE_TREECTRL
if ( wxDynamicCastThis(wxTreeCtrl) )
testFont = true;
-#endif wxUSE_TREECTRL
+#endif
//
wxUSE_TREECTRL
if ( testFont )
{
if ( testFont )
{
@@
-237,7
+241,7
@@
WXDWORD wxControl::MSWGetStyle(long style, WXDWORD *exstyle) const
{
long msStyle = wxWindow::MSWGetStyle(style, exstyle);
{
long msStyle = wxWindow::MSWGetStyle(style, exstyle);
- if ( AcceptsFocus() )
+ if ( AcceptsFocus
FromKeyboard
() )
{
msStyle |= WS_TABSTOP;
}
{
msStyle |= WS_TABSTOP;
}