added an error message if a bitmap can't be addedto the image list

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

diff --git a/src/motif/button.cpp b/src/motif/button.cpp
index d7cdab1c6a2359692750f578e8484b3ac65c1105..814d1a2a515b99fab4ceb6042f3a50fae0af502d 100644 (file)
--- a/src/motif/button.cpp
+++ b/src/motif/button.cpp
@@ -14,6 +14,14 @@
 #endif
 
 #include "wx/button.h"
+#include "wx/utils.h"
+
+#include <Xm/PushBG.h>
+#include <Xm/PushB.h>
+
+#include "wx/motif/private.h"
+
+void wxButtonCallback (Widget w, XtPointer clientData, XtPointer ptr);
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
@@ -30,6 +38,9 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
     SetName(name);
     SetValidator(validator);
     m_windowStyle = style;
+    m_backgroundColour = parent->GetBackgroundColour();
+    m_foregroundColour = parent->GetForegroundColour();
+    m_windowFont = parent->GetFont();
 
     parent->AddChild((wxButton *)this);
 
@@ -38,14 +49,41 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
     else
         m_windowId = id;
 
-    // TODO: create button
+    wxString label1(wxStripMenuCodes(label));
 
-    return FALSE;
-}
+    XmString text = XmStringCreateSimple ((char*) (const char*) label1);
+    Widget parentWidget = (Widget) parent->GetClientWidget();
 
-void wxButton::SetSize(int x, int y, int width, int height, int sizeFlags)
-{
-    // TODO
+    XmFontList fontList = (XmFontList) m_windowFont.GetFontList(1.0, XtDisplay(parentWidget));
+
+    /*
+     * Patch Note (important)
+     * There is no major reason to put a defaultButtonThickness here.
+     * Not requesting it give the ability to put wxButton with a spacing
+     * as small as requested. However, if some button become a DefaultButton,
+     * other buttons are no more aligned -- This is why we set
+     * defaultButtonThickness of ALL buttons belonging to the same wxPanel,
+     * in the ::SetDefaultButton method.
+     */
+    m_mainWidget = (WXWidget) XtVaCreateManagedWidget ("button",
+                                        xmPushButtonWidgetClass,
+                                                parentWidget,
+                                                 XmNfontList, fontList,
+                                                XmNlabelString, text,
+//                  XmNdefaultButtonShadowThickness, 1, // See comment for wxButton::SetDefault
+                                                NULL);
+
+    XmStringFree (text);
+
+    XtAddCallback ((Widget) m_mainWidget, XmNactivateCallback, (XtCallbackProc) wxButtonCallback,
+            (XtPointer) this);
+
+    SetCanAddEventHandler(TRUE);
+    AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, size.x, size.y);
+
+    ChangeBackgroundColour();
+
+    return TRUE;
 }
 
 void wxButton::SetDefault()
@@ -54,22 +92,63 @@ void wxButton::SetDefault()
     if (parent)
         parent->SetDefaultItem(this);
 
-    // TODO: make button the default
+  // We initially do not set XmNdefaultShadowThickness, to have small buttons.
+  // Unfortunately, buttons are now mis-aligned. We try to correct this
+  // now -- setting this ressource to 1 for each button in the same row.
+  // Because it's very hard to find wxButton in the same row,
+  // correction is straighforward: we set resource for all wxButton
+  // in this parent (but not sub panels)
+  for (wxNode * node = parent->GetChildren().First (); node; node = node->Next ())
+    {
+      wxButton *item = (wxButton *) node->Data ();
+      if (item->IsKindOf(CLASSINFO(wxButton)))
+       {
+          bool managed = XtIsManaged((Widget) item->GetMainWidget());
+          if (managed)
+            XtUnmanageChild ((Widget) item->GetMainWidget());
+
+         XtVaSetValues ((Widget) item->GetMainWidget(),
+                        XmNdefaultButtonShadowThickness, 1,
+                        NULL);
+
+          if (managed)
+            XtManageChild ((Widget) item->GetMainWidget());
+       }
+    }                          // while
+
+//  XtVaSetValues((Widget)handle, XmNshowAsDefault, 1, NULL);
+  XtVaSetValues ((Widget) parent->GetMainWidget(), XmNdefaultButton, (Widget) GetMainWidget(), NULL);
 }
 
-wxString wxButton::GetLabel() const
+void wxButton::Command (wxCommandEvent & event)
 {
-    // TODO
-    return wxString("");
+    ProcessCommand (event);
 }
 
-void wxButton::SetLabel(const wxString& label)
+void wxButtonCallback (Widget w, XtPointer clientData, XtPointer WXUNUSED(ptr))
 {
-    // TODO
+  if (!wxGetWindowFromTable(w))
+    // Widget has been deleted!
+    return;
+
+  wxButton *item = (wxButton *) clientData;
+  wxCommandEvent event (wxEVT_COMMAND_BUTTON_CLICKED, item->GetId());
+  event.SetEventObject(item);
+  item->ProcessCommand (event);
 }
 
-void wxButton::Command (wxCommandEvent & event)
+void wxButton::ChangeFont(bool keepOriginalSize)
 {
-    ProcessCommand (event);
+    wxWindow::ChangeFont(keepOriginalSize);
+}
+
+void wxButton::ChangeBackgroundColour()
+{
+    DoChangeBackgroundColour(m_mainWidget, m_backgroundColour, TRUE);
+}
+
+void wxButton::ChangeForegroundColour()
+{
+    wxWindow::ChangeForegroundColour();
 }