projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ribbon compilation fixes for OS X.
[wxWidgets.git]
/
src
/
motif
/
spinbutt.cpp
diff --git
a/src/motif/spinbutt.cpp
b/src/motif/spinbutt.cpp
index cdded68c3a756d9b9ec3b91006e44628dd0a0b16..fe8e6257b97d0c4e4087ae7c5d7a0de1309e04d4 100644
(file)
--- a/
src/motif/spinbutt.cpp
+++ b/
src/motif/spinbutt.cpp
@@
-1,5
+1,5
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: spinbutt.cpp
+// Name: s
rc/motif/s
pinbutt.cpp
// Purpose: wxSpinButton
// Author: Julian Smart
// Modified by:
// Purpose: wxSpinButton
// Author: Julian Smart
// Modified by:
@@
-9,20
+9,18
@@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma implementation "spinbutt.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
-#include "wx/defs.h"
-
#if wxUSE_SPINBTN
#include "wx/spinbutt.h"
#if wxUSE_SPINBTN
#include "wx/spinbutt.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/timer.h"
+#endif
+
#include "wx/spinctrl.h"
#include "wx/spinctrl.h"
-#include "wx/timer.h"
#ifdef __VMS__
#pragma message disable nosimpint
#ifdef __VMS__
#pragma message disable nosimpint
@@
-95,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,
@@
-186,10
+184,13
@@
void wxArrowButton::StopTimerCallback( Widget w, XtPointer clientData,
btn->m_timer = 0;
}
btn->m_timer = 0;
}
-bool wxArrowButton::Create( wxSpinButton* parent, wxWindowID id,
+bool wxArrowButton::Create( wxSpinButton* parent,
+ wxWindowID WXUNUSED(id),
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 )
@@
-208,7
+209,8
@@
bool wxArrowButton::Create( wxSpinButton* parent, wxWindowID id,
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",
@@
-229,11
+231,10
@@
bool wxArrowButton::Create( wxSpinButton* parent, wxWindowID id,
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;
}
@@
-241,10
+242,10
@@
bool wxArrowButton::Create( wxSpinButton* parent, wxWindowID id,
// wxSpinButton
// ----------------------------------------------------------------------------
// wxSpinButton
// ----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl)
;
-IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent)
;
+IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent)
-static void CalcSizes(
wxPoint pt, wxSize
sz,
+static void CalcSizes(
const wxPoint& pt, const wxSize&
sz,
wxPoint& pt1, wxSize& sz1,
wxPoint& pt2, wxSize& sz2,
bool isVertical )
wxPoint& pt1, wxSize& sz1,
wxPoint& pt2, wxSize& sz2,
bool isVertical )
@@
-313,19
+314,12
@@
void wxSpinButton::DoMoveWindow(int x, int y, int width, int height)
m_down->SetSize( pt2.x, pt2.y, sz2.x, sz2.y );
}
m_down->SetSize( pt2.x, pt2.y, sz2.x, sz2.y );
}
-void wxSpinButton::DoSetSize(int x, int y, int width, int height,
- int sizeFlags)
+void wxSpinButton::DoSetSize(int x, int y, int width, int height, int sizeFlags)
{
{
-#ifdef __VMS__
-#pragma message disable codcauunr
-#endif
- if( sizeFlags & wxSIZE_USE_EXISTING && width == -1 )
+ if ( (sizeFlags & wxSIZE_ALLOW_MINUS_ONE) && width == -1 )
width = GetSize().x;
width = GetSize().x;
- if
( sizeFlags & wxSIZE_USE_EXISTING
&& height == -1 )
+ if
( (sizeFlags & wxSIZE_ALLOW_MINUS_ONE)
&& height == -1 )
height = GetSize().y;
height = GetSize().y;
-#ifdef __VMS__
-#pragma message enable codcauunr
-#endif
wxControl::DoSetSize(x, y, width, height, 0);
}
wxControl::DoSetSize(x, y, width, height, 0);
}
@@
-358,7
+352,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() )
{
@@
-366,7
+360,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 );
}
}
}
}