corrected CodeWarrior project target names and generated application names

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

diff --git a/src/motif/button.cpp b/src/motif/button.cpp
index 144cb92156569078c36e2adee0bb06164336064e..f9a139b0688da6648c0e2c9a7b8eca5428ecf21f 100644 (file)
--- a/src/motif/button.cpp
+++ b/src/motif/button.cpp
@@ -13,20 +13,30 @@
 #pragma implementation "button.h"
 #endif
 
 #pragma implementation "button.h"
 #endif
 

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

 #include "wx/button.h"
 #include "wx/utils.h"
 #include "wx/panel.h"
 
 #include "wx/button.h"
 #include "wx/utils.h"
 #include "wx/panel.h"
 

+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif

 #include <Xm/PushBG.h>
 #include <Xm/PushB.h>
 #include <Xm/PushBG.h>
 #include <Xm/PushB.h>

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

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

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)

-#endif

 
 // Button
 
 
 // Button
 


@@ -80,7 +90,17 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
         (XtPointer) this);
 
     SetCanAddEventHandler(TRUE);
         (XtPointer) this);
 
     SetCanAddEventHandler(TRUE);

-    AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, size.x, size.y);
+    
+    int x = 0;  int y = 0;
+    wxFont new_font( parent->GetFont() );
+    GetTextExtent( label1, &x, &y, (int*)NULL, (int*)NULL, &new_font );
+
+    wxSize newSize = size;
+    if (newSize.x == -1) newSize.x = 30+x;
+    if (newSize.y == -1) newSize.y = 27+y;
+    SetSize( newSize.x, newSize.y );
+    
+    AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, newSize.x, newSize.y);

 
     ChangeBackgroundColour();
 
 
     ChangeBackgroundColour();
 


@@ -90,7 +110,7 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
 void wxButton::SetDefault()
 {
     wxWindow *parent = GetParent();
 void wxButton::SetDefault()
 {
     wxWindow *parent = GetParent();

-    wxPanel *panel = wxDynamicCast(panel, wxPanel);
+    wxPanel *panel = wxDynamicCast(parent, wxPanel);

     if ( panel )
         panel->SetDefaultItem(this);
 
     if ( panel )
         panel->SetDefaultItem(this);