projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
compilation fix for old SDKs (VC6...) which don't define HDM_SETBITMAPMARGIN/Header_S...
[wxWidgets.git]
/
src
/
motif
/
control.cpp
diff --git
a/src/motif/control.cpp
b/src/motif/control.cpp
index 18f8bbeb686c1aca9453b273173c9cbaeb164913..0924e49ef4385d181b3db6f0263a15f08cd50f0c 100644
(file)
--- a/
src/motif/control.cpp
+++ b/
src/motif/control.cpp
@@
-13,8
+13,11
@@
#include "wx/wxprec.h"
#include "wx/control.h"
#include "wx/wxprec.h"
#include "wx/control.h"
-#include "wx/panel.h"
-#include "wx/utils.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/utils.h"
+ #include "wx/panel.h"
+#endif
#ifdef __VMS__
#pragma message disable nosimpint
#ifdef __VMS__
#pragma message disable nosimpint
@@
-34,9
+37,6
@@
END_EVENT_TABLE()
// Item members
wxControl::wxControl()
{
// Item members
wxControl::wxControl()
{
- m_backgroundColour = *wxWHITE;
- m_foregroundColour = *wxBLACK;
-
m_inSetValue = false;
}
m_inSetValue = false;
}
@@
-69,10
+69,6
@@
bool wxControl::CreateControl(wxWindow *parent,
validator, name ) )
return false;
validator, name ) )
return false;
- m_backgroundColour = parent->GetBackgroundColour();
- m_foregroundColour = parent->GetForegroundColour();
- m_font = parent->GetFont();
-
return true;
}
return true;
}
@@
-82,7
+78,7
@@
void wxControl::SetLabel(const wxString& label)
if (!widget)
return;
if (!widget)
return;
- wxXmString label_str(
wxStripMenuCodes
(label));
+ wxXmString label_str(
GetLabelText
(label));
XtVaSetValues (widget,
XmNlabelString, label_str(),
XtVaSetValues (widget,
XmNlabelString, label_str(),
@@
-106,7
+102,7
@@
wxString wxControl::GetLabel() const
bool wxControl::ProcessCommand(wxCommandEvent & event)
{
bool wxControl::ProcessCommand(wxCommandEvent & event)
{
- return
GetEventHandler()->Process
Event(event);
+ return
HandleWindow
Event(event);
}
wxSize wxControl::DoGetBestSize() const
}
wxSize wxControl::DoGetBestSize() const