Commit mentioned fix/hack to enable controls

[wxWidgets.git] / src / motif / spinbutt.cpp

diff --git a/src/motif/spinbutt.cpp b/src/motif/spinbutt.cpp
index 0ffb7cd60d56fc0a9574355a4f5493666a82f5cd..edd15fa3c96aa814137718897052180ed580e7d2 100644 (file)
--- a/src/motif/spinbutt.cpp
+++ b/src/motif/spinbutt.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "spinbutt.h"
 #endif
 
     #pragma implementation "spinbutt.h"
 #endif
 


@@ -183,7 +183,7 @@ bool wxArrowButton::Create( wxSpinButton* parent, wxWindowID id,
                             ArrowDirection d,
                             const wxPoint& pos, const wxSize& size )
 {
                             ArrowDirection d,
                             const wxPoint& pos, const wxSize& size )
 {

-    int arrow_dir;
+    int arrow_dir = XmARROW_UP;

 
     switch( d )
     {
 
     switch( d )
     {


@@ -209,6 +209,7 @@ bool wxArrowButton::Create( wxSpinButton* parent, wxWindowID id,
         parentWidget,
         XmNarrowDirection, arrow_dir,
         XmNborderWidth, 0,
         parentWidget,
         XmNarrowDirection, arrow_dir,
         XmNborderWidth, 0,

+        XmNshadowThickness, 0,

         NULL );
 
     XtAddCallback( (Widget) m_mainWidget,
         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 );
 
     AttachWidget( parent, m_mainWidget, (WXWidget) NULL,
                   pos.x, pos.y, size.x, size.y );
 

+    SetForegroundColour( parent->GetBackgroundColour() );
+

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -271,18 +274,16 @@ bool wxSpinButton::Create( wxWindow *parent, wxWindowID id,
 
     SetName(name);
 
 
     SetName(name);
 

-    InitBase();
-

     m_windowId = ( id == -1 ) ? NewControlId() : id;
 
     bool isVert = IsVertical();
     wxPoint pt1, pt2;
     wxSize sz1, sz2;
     CalcSizes( wxPoint(0,0), newSize, pt1, sz1, pt2, sz2, isVert );
     m_windowId = ( id == -1 ) ? NewControlId() : id;
 
     bool isVert = IsVertical();
     wxPoint pt1, pt2;
     wxSize sz1, sz2;
     CalcSizes( wxPoint(0,0), newSize, pt1, sz1, pt2, sz2, isVert );

-    m_up = new wxArrowButton( this, -1, isVert ? wxARROW_UP : wxARROW_LEFT,
+    m_up = new wxArrowButton( this, -1, isVert ? wxARROW_UP : wxARROW_RIGHT,

                               pt1, sz1, 1 );
     m_down = new wxArrowButton( this, -1,
                               pt1, sz1, 1 );
     m_down = new wxArrowButton( this, -1,

-                                isVert ? wxARROW_DOWN : wxARROW_RIGHT,
+                                isVert ? wxARROW_DOWN : wxARROW_LEFT,

                                 pt2, sz2, -1 );
 
     return TRUE;
                                 pt2, sz2, -1 );
 
     return TRUE;


@@ -308,10 +309,16 @@ void wxSpinButton::DoMoveWindow(int x, int y, int width, int height)
 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 )
         width = GetSize().x;
     if( sizeFlags & wxSIZE_USE_EXISTING && height == -1 )
         height = GetSize().y;
     if( sizeFlags & wxSIZE_USE_EXISTING && width == -1 )
         width = GetSize().x;
     if( sizeFlags & wxSIZE_USE_EXISTING && height == -1 )
         height = GetSize().y;

+#ifdef __VMS__
+#pragma message enable codcauunr
+#endif

 
     wxControl::DoSetSize(x, y, width, height, 0);
 }
 
     wxControl::DoSetSize(x, y, width, height, 0);
 }


@@ -325,14 +332,14 @@ void wxSpinButton::Increment( int delta )
 
     if( npos < m_min )
     {
 
     if( npos < m_min )
     {

-        if( GetWindowStyle() && wxSP_WRAP )
+        if( GetWindowStyle() & wxSP_WRAP )

             npos = m_max;
         else
             npos = m_min;
     }
     if( npos > m_max )
     {
             npos = m_max;
         else
             npos = m_min;
     }
     if( npos > m_max )
     {

-        if( GetWindowStyle() && wxSP_WRAP )
+        if( GetWindowStyle() & wxSP_WRAP )

             npos = m_min;
         else
             npos = m_max;
             npos = m_min;
         else
             npos = m_max;


@@ -358,7 +365,7 @@ void wxSpinButton::Increment( int delta )
 
 wxSize wxSpinButton::DoGetBestSize() const
 {
 
 wxSize wxSpinButton::DoGetBestSize() const
 {

-    return IsVertical() ? wxSize( 24, 34 ) : wxSize( 34, 24 );
+    return IsVertical() ? wxSize( 20, 30 ) : wxSize( 30, 20 );

 }
 
 // Attributes
 }
 
 // Attributes