Removed no longer needed code to fix combo sizing (causes layout problems on Windows)

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

diff --git a/src/palmos/button.cpp b/src/palmos/button.cpp
index f9be99b62a6b9c7d469d48be5c84302b16403ce4..b2b7b6ef309450100a229af648f333c1baad114b 100644 (file)
--- a/src/palmos/button.cpp
+++ b/src/palmos/button.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "button.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -38,8 +34,15 @@
     #include "wx/bmpbuttn.h"
     #include "wx/settings.h"
     #include "wx/dcscreen.h"
+    #include "wx/frame.h"
+    #include "wx/dialog.h"
 #endif
 
+#include "wx/stockitem.h"
+
+#include <Control.h>
+#include <Form.h>
+
 // ----------------------------------------------------------------------------
 // macros
 // ----------------------------------------------------------------------------
@@ -126,40 +129,78 @@ bool wxButton::Create(wxWindow *parent,
                       const wxValidator& validator,
                       const wxString& name)
 {
-    wxControl::PalmCreateControl(buttonCtl, parent, id, label, pos, size);
-    return true;
+    // Default coordinates based on the knowledgebase recipe "Buttons"
+    wxSize palmSize(size.x==wxDefaultCoord?36:size.x,
+                    size.y==wxDefaultCoord?12:size.y);
+
+    // Default placement depends on dialog vs. frame type of parent
+    wxPoint palmPos(pos);
+    if((palmPos.x==wxDefaultCoord)||(palmPos.y==wxDefaultCoord))
+    {
+        wxSize parentSize(parent->GetClientSize());
+        wxWindow* parentTLW = parent;
+        while ( parentTLW && !parentTLW->IsTopLevel() )
+        {
+            parentTLW = parentTLW->GetParent();
+        }
+
+        if(wxDynamicCast(parentTLW, wxFrame)!=NULL)
+        {
+            if(palmPos.x==wxDefaultCoord)
+                palmPos.x = 0;
+            if(palmPos.y==wxDefaultCoord)
+                palmPos.y = parentSize.y-palmSize.y;
+        }
+        else if(wxDynamicCast(parentTLW, wxDialog)!=NULL)
+        {
+            if(palmPos.x==wxDefaultCoord)
+                palmPos.x = 4;
+            if(palmPos.y==wxDefaultCoord)
+                palmPos.y = parentSize.y-palmSize.y-5;
+        }
+        else
+        {
+            // something seriously broken
+            return false;
+        }
+    }
+
+    // take the stock label
+    wxString palmLabel = label;
+    if( palmLabel.empty() && wxIsStockID(id) )
+        palmLabel = wxGetStockLabel(id, false);
+
+    if(!wxControl::Create(parent, id, palmPos, palmSize, style, validator, name))
+        return false;
+
+    return wxControl::PalmCreateControl(buttonCtl, palmLabel, palmPos, palmSize);
 }
 
 wxButton::~wxButton()
 {
 }
 
-// ----------------------------------------------------------------------------
-// flags
-// ----------------------------------------------------------------------------
-
-WXDWORD wxButton::MSWGetStyle(long style, WXDWORD *exstyle) const
-{
-    return 0;
-}
-
 // ----------------------------------------------------------------------------
 // size management including autosizing
 // ----------------------------------------------------------------------------
 
 wxSize wxButton::DoGetBestSize() const
 {
-    return wxSize(0,0);
+    return wxSize(36,12);
 }
 
 /* static */
 wxSize wxButtonBase::GetDefaultSize()
 {
-    return wxSize(0,0);
+    return wxSize(36,12);
 }
 
 void wxButton::SetDefault()
 {
+    FormType* form = (FormType* )GetParentForm();
+    if(form==NULL)
+        return;
+    FrmSetDefaultButtonID(form,GetId());
 }
 
 void wxButton::SetTmpDefault()
@@ -182,20 +223,14 @@ wxButton::SetDefaultStyle(wxButton *btn, bool on)
 
 bool wxButton::SendClickEvent()
 {
-    return false;
-}
-
-void wxButton::Command(wxCommandEvent & event)
-{
+    wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, GetId());
+    event.SetEventObject(this);
+    return ProcessCommand(event);
 }
 
-// ----------------------------------------------------------------------------
-// event/message handlers
-// ----------------------------------------------------------------------------
-
-bool wxButton::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
+void wxButton::Command(wxCommandEvent &event)
 {
-    return false;
+    ProcessCommand(event);
 }
 
 #endif // wxUSE_BUTTON