projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
No real changes, just use wxString::clear() instead of assignment.
[wxWidgets.git]
/
src
/
motif
/
spinbutt.cpp
diff --git
a/src/motif/spinbutt.cpp
b/src/motif/spinbutt.cpp
index 4f32323ea2fc5eb75641db4ed058c4b883e3bcac..44c4baf6f035338d8b3d264f7bd8ac47d57ca795 100644
(file)
--- a/
src/motif/spinbutt.cpp
+++ b/
src/motif/spinbutt.cpp
@@
-93,7
+93,7
@@
public:
Create( parent, id, d, pos, size );
}
Create( parent, id, d, pos, size );
}
- ~wxArrowButton()
+
virtual
~wxArrowButton()
{ delete m_timer; }
bool Create( wxSpinButton* parent, wxWindowID id, ArrowDirection d,
{ delete m_timer; }
bool Create( wxSpinButton* parent, wxWindowID id, ArrowDirection d,
@@
-180,8
+180,7
@@
void wxArrowButton::StopTimerCallback( Widget w, XtPointer clientData,
return;
wxArrowButton* btn = (wxArrowButton*)clientData;
return;
wxArrowButton* btn = (wxArrowButton*)clientData;
- delete btn->m_timer;
- btn->m_timer = 0;
+ wxDELETE(btn->m_timer);
}
bool wxArrowButton::Create( wxSpinButton* parent,
}
bool wxArrowButton::Create( wxSpinButton* parent,
@@
-189,6
+188,8
@@
bool wxArrowButton::Create( wxSpinButton* parent,
ArrowDirection d,
const wxPoint& pos, const wxSize& size )
{
ArrowDirection d,
const wxPoint& pos, const wxSize& size )
{
+ wxCHECK_MSG( parent, false, wxT("must have a valid parent") );
+
int arrow_dir = XmARROW_UP;
switch( d )
int arrow_dir = XmARROW_UP;
switch( d )
@@
-207,7
+208,8
@@
bool wxArrowButton::Create( wxSpinButton* parent,
break;
}
break;
}
- if( parent ) parent->AddChild( this );
+ parent->AddChild( this );
+ PreCreation();
Widget parentWidget = (Widget) parent->GetClientWidget();
m_mainWidget = (WXWidget) XtVaCreateManagedWidget( "XmArrowButton",
Widget parentWidget = (Widget) parent->GetClientWidget();
m_mainWidget = (WXWidget) XtVaCreateManagedWidget( "XmArrowButton",
@@
-228,11
+230,10
@@
bool wxArrowButton::Create( wxSpinButton* parent,
XmNactivateCallback, (XtCallbackProc) StopTimerCallback,
(XtPointer) this );
XmNactivateCallback, (XtCallbackProc) StopTimerCallback,
(XtPointer) this );
+ PostCreation();
AttachWidget( parent, m_mainWidget, (WXWidget) NULL,
pos.x, pos.y, size.x, size.y );
AttachWidget( parent, m_mainWidget, (WXWidget) NULL,
pos.x, pos.y, size.x, size.y );
- SetForegroundColour( parent->GetBackgroundColour() );
-
return true;
}
return true;
}
@@
-240,9
+241,6
@@
bool wxArrowButton::Create( wxSpinButton* parent,
// wxSpinButton
// ----------------------------------------------------------------------------
// wxSpinButton
// ----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl)
-IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent)
-
static void CalcSizes( const wxPoint& pt, const wxSize& sz,
wxPoint& pt1, wxSize& sz1,
wxPoint& pt2, wxSize& sz2,
static void CalcSizes( const wxPoint& pt, const wxSize& sz,
wxPoint& pt1, wxSize& sz1,
wxPoint& pt2, wxSize& sz2,
@@
-350,7
+348,7
@@
void wxSpinButton::Increment( int delta )
event.SetPosition( npos );
event.SetEventObject( this );
event.SetPosition( npos );
event.SetEventObject( this );
-
GetEventHandler()->Process
Event( event );
+
HandleWindow
Event( event );
if( event.IsAllowed() )
{
if( event.IsAllowed() )
{
@@
-358,7
+356,7
@@
void wxSpinButton::Increment( int delta )
event.SetEventType( wxEVT_SCROLL_THUMBTRACK );
event.SetPosition( m_pos );
event.SetEventType( wxEVT_SCROLL_THUMBTRACK );
event.SetPosition( m_pos );
-
GetEventHandler()->Process
Event( event );
+
HandleWindow
Event( event );
}
}
}
}