X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/038305d00824a4950e8dde0cb8a29e8344c42c88..4d073429a06c885db6440b79d754d8316d847223:/src/motif/spinbutt.cpp diff --git a/src/motif/spinbutt.cpp b/src/motif/spinbutt.cpp index d48978ec07..edd15fa3c9 100644 --- a/src/motif/spinbutt.cpp +++ b/src/motif/spinbutt.cpp @@ -9,7 +9,7 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "spinbutt.h" #endif @@ -183,7 +183,7 @@ bool wxArrowButton::Create( wxSpinButton* parent, wxWindowID id, ArrowDirection d, const wxPoint& pos, const wxSize& size ) { - int arrow_dir; + int arrow_dir = XmARROW_UP; switch( d ) { @@ -209,6 +209,7 @@ bool wxArrowButton::Create( wxSpinButton* parent, wxWindowID id, parentWidget, XmNarrowDirection, arrow_dir, XmNborderWidth, 0, + XmNshadowThickness, 0, NULL ); XtAddCallback( (Widget) m_mainWidget, @@ -224,6 +225,8 @@ bool wxArrowButton::Create( wxSpinButton* parent, wxWindowID id, AttachWidget( parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, size.x, size.y ); + SetForegroundColour( parent->GetBackgroundColour() ); + return TRUE; } @@ -271,8 +274,6 @@ bool wxSpinButton::Create( wxWindow *parent, wxWindowID id, SetName(name); - InitBase(); - m_windowId = ( id == -1 ) ? NewControlId() : id; bool isVert = IsVertical(); @@ -364,7 +365,7 @@ void wxSpinButton::Increment( int delta ) wxSize wxSpinButton::DoGetBestSize() const { - return IsVertical() ? wxSize( 24, 34 ) : wxSize( 34, 24 ); + return IsVertical() ? wxSize( 20, 30 ) : wxSize( 30, 20 ); } // Attributes