missing commit

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

diff --git a/src/motif/button.cpp b/src/motif/button.cpp
index b5ce08a96006e4979de75f769d74a21bbbf62742..14418ab50a9f6f6eca75d8de0be778baeff1b79c 100644 (file)
--- a/src/motif/button.cpp
+++ b/src/motif/button.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        button.cpp
+// Name:        src/motif/button.cpp

 // Purpose:     wxButton
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxButton
 // Author:      Julian Smart
 // Modified by:


@@ -12,12 +12,6 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#ifdef __VMS
-#define XtDisplay XTDISPLAY
-#endif
-
-#include "wx/defs.h"
-

 #include "wx/button.h"
 
 #ifdef __VMS__
 #include "wx/button.h"
 
 #ifdef __VMS__


@@ -29,14 +23,17 @@
 #pragma message enable nosimpint
 #endif
 
 #pragma message enable nosimpint
 #endif
 

+
+#ifndef WX_PRECOMP
+    #include "wx/toplevel.h"
+#endif
+

 #include "wx/stockitem.h"
 #include "wx/motif/private.h"
 #include "wx/sysopt.h"
 
 void wxButtonCallback (Widget w, XtPointer clientData, XtPointer ptr);
 
 #include "wx/stockitem.h"
 #include "wx/motif/private.h"
 #include "wx/sysopt.h"
 
 void wxButtonCallback (Widget w, XtPointer clientData, XtPointer ptr);
 

-IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
-

 #define MIN_WIDTH 78
 #define MIN_LARGE_HEIGHT 30
 
 #define MIN_WIDTH 78
 #define MIN_LARGE_HEIGHT 30
 


@@ -51,12 +48,12 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& lbl,
     wxString label(lbl);
     if (label.empty() && wxIsStockID(id))
         label = wxGetStockLabel(id);
     wxString label(lbl);
     if (label.empty() && wxIsStockID(id))
         label = wxGetStockLabel(id);

-    
+

     if( !CreateControl( parent, id, pos, size, style, validator, name ) )
         return false;
     if( !CreateControl( parent, id, pos, size, style, validator, name ) )
         return false;

+    PreCreation();

 
 

-    wxString label1(wxStripMenuCodes(label));
-    wxXmString text( label1 );
+    wxXmString text( GetLabelText(label) );

 
     Widget parentWidget = (Widget) parent->GetClientWidget();
 
 
     Widget parentWidget = (Widget) parent->GetClientWidget();
 


@@ -76,7 +73,7 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& lbl,
         XmNlabelString, text(),
         XmNrecomputeSize, False,
         // See comment for wxButton::SetDefault
         XmNlabelString, text(),
         XmNrecomputeSize, False,
         // See comment for wxButton::SetDefault

-        // XmNdefaultButtonShadowThickness, 1, 
+        // XmNdefaultButtonShadowThickness, 1,

         NULL);
 
     XtAddCallback ((Widget) m_mainWidget,
         NULL);
 
     XtAddCallback ((Widget) m_mainWidget,


@@ -87,11 +84,10 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& lbl,
     if( size.x != -1 ) best.x = size.x;
     if( size.y != -1 ) best.y = size.y;
 
     if( size.x != -1 ) best.x = size.x;
     if( size.y != -1 ) best.y = size.y;
 

+    PostCreation();

     AttachWidget (parent, m_mainWidget, (WXWidget) NULL,
                   pos.x, pos.y, best.x, best.y);
 
     AttachWidget (parent, m_mainWidget, (WXWidget) NULL,
                   pos.x, pos.y, best.x, best.y);
 

-    ChangeBackgroundColour();
-

     return true;
 }
 
     return true;
 }
 


@@ -123,11 +119,9 @@ void wxButton::SetDefaultShadowThicknessAndResize()
 }
 
 
 }
 
 

-void wxButton::SetDefault()
+wxWindow *wxButton::SetDefault()

 {
 {

-    wxWindow *parent = GetParent();
-    if ( parent )
-        parent->SetDefaultItem(this);
+    wxWindow *oldDefault = wxButtonBase::SetDefault();

 
     // We initially do not set XmNdefaultShadowThickness, to have
     // small buttons.  Unfortunately, buttons are now mis-aligned. We
 
     // We initially do not set XmNdefaultShadowThickness, to have
     // small buttons.  Unfortunately, buttons are now mis-aligned. We


@@ -136,6 +130,7 @@ void wxButton::SetDefault()
     // wxButton in the same row, correction is straighforward: we set
     // resource for all wxButton in this parent (but not sub panels)
 
     // wxButton in the same row, correction is straighforward: we set
     // resource for all wxButton in this parent (but not sub panels)
 

+    wxWindow *parent = GetParent();

     for (wxWindowList::compatibility_iterator node = parent->GetChildren().GetFirst ();
          node; node = node->GetNext ())
     {
     for (wxWindowList::compatibility_iterator node = parent->GetChildren().GetFirst ();
          node; node = node->GetNext ())
     {


@@ -148,6 +143,8 @@ void wxButton::SetDefault()
     XtVaSetValues ((Widget) parent->GetMainWidget(),
                    XmNdefaultButton, (Widget) GetMainWidget(),
                    NULL);
     XtVaSetValues ((Widget) parent->GetMainWidget(),
                    XmNdefaultButton, (Widget) GetMainWidget(),
                    NULL);

+
+    return oldDefault;

 }
 
 static inline bool wxMotifLargeButtons()
 }
 
 static inline bool wxMotifLargeButtons()


@@ -245,7 +242,7 @@ void wxButtonCallback (Widget w, XtPointer clientData, XtPointer WXUNUSED(ptr))
         return;
 
     wxButton *item = (wxButton *) clientData;
         return;
 
     wxButton *item = (wxButton *) clientData;

-    wxCommandEvent event (wxEVT_COMMAND_BUTTON_CLICKED, item->GetId());
+    wxCommandEvent event (wxEVT_BUTTON, item->GetId());

     event.SetEventObject(item);
     item->ProcessCommand (event);
 }
     event.SetEventObject(item);
     item->ProcessCommand (event);
 }