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 17baee2123d1ec94136e05dc0943faae2af8a0e4..b2b7b6ef309450100a229af648f333c1baad114b 100644 (file)
--- a/src/palmos/button.cpp
+++ b/src/palmos/button.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // 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"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -40,9 +36,13 @@
     #include "wx/dcscreen.h"
     #include "wx/frame.h"
     #include "wx/dialog.h"
     #include "wx/dcscreen.h"
     #include "wx/frame.h"
     #include "wx/dialog.h"

-    #include "wx/stockitem.h"

 #endif
 
 #endif
 

+#include "wx/stockitem.h"
+
+#include <Control.h>
+#include <Form.h>
+

 // ----------------------------------------------------------------------------
 // macros
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // macros
 // ----------------------------------------------------------------------------


@@ -137,7 +137,7 @@ bool wxButton::Create(wxWindow *parent,
     wxPoint palmPos(pos);
     if((palmPos.x==wxDefaultCoord)||(palmPos.y==wxDefaultCoord))
     {
     wxPoint palmPos(pos);
     if((palmPos.x==wxDefaultCoord)||(palmPos.y==wxDefaultCoord))
     {

-        wxSize parentSize(parent->GetSize());
+        wxSize parentSize(parent->GetClientSize());

         wxWindow* parentTLW = parent;
         while ( parentTLW && !parentTLW->IsTopLevel() )
         {
         wxWindow* parentTLW = parent;
         while ( parentTLW && !parentTLW->IsTopLevel() )
         {


@@ -147,14 +147,14 @@ bool wxButton::Create(wxWindow *parent,
         if(wxDynamicCast(parentTLW, wxFrame)!=NULL)
         {
             if(palmPos.x==wxDefaultCoord)
         if(wxDynamicCast(parentTLW, wxFrame)!=NULL)
         {
             if(palmPos.x==wxDefaultCoord)

-                palmPos.x = 1;
+                palmPos.x = 0;

             if(palmPos.y==wxDefaultCoord)
                 palmPos.y = parentSize.y-palmSize.y;
         }
         else if(wxDynamicCast(parentTLW, wxDialog)!=NULL)
         {
             if(palmPos.x==wxDefaultCoord)
             if(palmPos.y==wxDefaultCoord)
                 palmPos.y = parentSize.y-palmSize.y;
         }
         else if(wxDynamicCast(parentTLW, wxDialog)!=NULL)
         {
             if(palmPos.x==wxDefaultCoord)

-                palmPos.x = 5;
+                palmPos.x = 4;

             if(palmPos.y==wxDefaultCoord)
                 palmPos.y = parentSize.y-palmSize.y-5;
         }
             if(palmPos.y==wxDefaultCoord)
                 palmPos.y = parentSize.y-palmSize.y-5;
         }


@@ -168,10 +168,12 @@ bool wxButton::Create(wxWindow *parent,
     // take the stock label
     wxString palmLabel = label;
     if( palmLabel.empty() && wxIsStockID(id) )
     // take the stock label
     wxString palmLabel = label;
     if( palmLabel.empty() && wxIsStockID(id) )

-        palmLabel = wxGetStockLabel(id);
+        palmLabel = wxGetStockLabel(id, false);
+
+    if(!wxControl::Create(parent, id, palmPos, palmSize, style, validator, name))
+        return false;

 
 

-    wxControl::PalmCreateControl(buttonCtl, parent, id, palmLabel, palmPos, palmSize);
-    return true;
+    return wxControl::PalmCreateControl(buttonCtl, palmLabel, palmPos, palmSize);

 }
 
 wxButton::~wxButton()
 }
 
 wxButton::~wxButton()


@@ -195,7 +197,7 @@ wxSize wxButtonBase::GetDefaultSize()
 
 void wxButton::SetDefault()
 {
 
 void wxButton::SetDefault()
 {

-    FormType* form = GetParentForm();
+    FormType* form = (FormType* )GetParentForm();

     if(form==NULL)
         return;
     FrmSetDefaultButtonID(form,GetId());
     if(form==NULL)
         return;
     FrmSetDefaultButtonID(form,GetId());


@@ -221,11 +223,14 @@ wxButton::SetDefaultStyle(wxButton *btn, bool on)
 
 bool wxButton::SendClickEvent()
 {
 
 bool wxButton::SendClickEvent()
 {

-    return false;
+    wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, GetId());
+    event.SetEventObject(this);
+    return ProcessCommand(event);

 }
 
 void wxButton::Command(wxCommandEvent &event)
 {
 }
 
 void wxButton::Command(wxCommandEvent &event)
 {

+    ProcessCommand(event);

 }
 
 #endif // wxUSE_BUTTON
 }
 
 #endif // wxUSE_BUTTON