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 VC6 with standard (i.e. not updated) SDK (patch 1828610)
[wxWidgets.git]
/
src
/
motif
/
control.cpp
diff --git
a/src/motif/control.cpp
b/src/motif/control.cpp
index c972668ad121179a385afb368493ddd65fc4e4e1..3d6cdf909c23b09509f3e5433918b363cb093933 100644
(file)
--- a/
src/motif/control.cpp
+++ b/
src/motif/control.cpp
@@
-1,5
+1,5
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: control.cpp
+// Name:
src/motif/
control.cpp
// Purpose: wxControl class
// Author: Julian Smart
// Modified by:
// Purpose: wxControl class
// Author: Julian Smart
// Modified by:
@@
-9,15
+9,15
@@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "control.h"
-#endif
-
-#include "wx/defs.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
#include "wx/control.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
@@
-37,14
+37,7
@@
END_EVENT_TABLE()
// Item members
wxControl::wxControl()
{
// Item members
wxControl::wxControl()
{
- m_backgroundColour = *wxWHITE;
- m_foregroundColour = *wxBLACK;
-
-#if WXWIN_COMPATIBILITY
- m_callback = 0;
-#endif // WXWIN_COMPATIBILITY
-
- m_inSetValue = FALSE;
+ m_inSetValue = false;
}
bool wxControl::Create( wxWindow *parent,
}
bool wxControl::Create( wxWindow *parent,
@@
-74,13
+67,9
@@
bool wxControl::CreateControl(wxWindow *parent,
{
if( !wxControlBase::CreateControl( parent, id, pos, size, style,
validator, name ) )
{
if( !wxControlBase::CreateControl( parent, id, pos, size, style,
validator, name ) )
- return FALSE;
-
- m_backgroundColour = parent->GetBackgroundColour();
- m_foregroundColour = parent->GetForegroundColour();
- m_font = parent->GetFont();
+ return false;
- return
TRUE
;
+ return
true
;
}
void wxControl::SetLabel(const wxString& label)
}
void wxControl::SetLabel(const wxString& label)
@@
-89,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(),
@@
-103,7
+92,7
@@
wxString wxControl::GetLabel() const
if (!widget)
return wxEmptyString;
if (!widget)
return wxEmptyString;
- XmString text;
+ XmString text
= NULL
;
XtVaGetValues (widget,
XmNlabelString, &text,
NULL);
XtVaGetValues (widget,
XmNlabelString, &text,
NULL);
@@
-113,15
+102,18
@@
wxString wxControl::GetLabel() const
bool wxControl::ProcessCommand(wxCommandEvent & event)
{
bool wxControl::ProcessCommand(wxCommandEvent & event)
{
-#if WXWIN_COMPATIBILITY
- if ( m_callback )
- {
- (void)(*m_callback)(this, event);
+ return GetEventHandler()->ProcessEvent(event);
+}
+
+wxSize wxControl::DoGetBestSize() const
+{
+ Widget w = (Widget)GetTopWidget();
- return TRUE;
- }
- else
-#endif // WXWIN_COMPATIBILITY
+ // Do not return any arbitrary default value...
+ wxASSERT_MSG (w, wxT("DoGetBestSize called before creation"));
- return GetEventHandler()->ProcessEvent(event);
+ XtWidgetGeometry preferred;
+ XtQueryGeometry (w, NULL, &preferred);
+
+ return wxSize(preferred.width, preferred.height);
}
}