fix for glib critical errors when closing an mdi child

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

diff --git a/src/palmos/button.cpp b/src/palmos/button.cpp
index a0d0f088a541050a526878fdc1bc12632110792b..94dae6c81ca9cecae3a5ff2005b070830973dd0b 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"
 
@@ -30,9 +26,10 @@
 
 #if wxUSE_BUTTON
 
+#include "wx/button.h"
+
 #ifndef WX_PRECOMP
     #include "wx/app.h"
-    #include "wx/button.h"
     #include "wx/brush.h"
     #include "wx/panel.h"
     #include "wx/bmpbuttn.h"
@@ -40,9 +37,13 @@
     #include "wx/dcscreen.h"
     #include "wx/frame.h"
     #include "wx/dialog.h"
-    #include "wx/stockitem.h"
 #endif
 
+#include "wx/stockitem.h"
+
+#include <Control.h>
+#include <Form.h>
+
 // ----------------------------------------------------------------------------
 // macros
 // ----------------------------------------------------------------------------
@@ -137,7 +138,7 @@ bool wxButton::Create(wxWindow *parent,
     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() )
         {
@@ -147,14 +148,14 @@ bool wxButton::Create(wxWindow *parent,
         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)
-                palmPos.x = 5;
+                palmPos.x = 4;
             if(palmPos.y==wxDefaultCoord)
                 palmPos.y = parentSize.y-palmSize.y-5;
         }
@@ -168,7 +169,7 @@ bool wxButton::Create(wxWindow *parent,
     // take the stock label
     wxString palmLabel = label;
     if( palmLabel.empty() && wxIsStockID(id) )
-        palmLabel = wxGetStockLabel(id);
+        palmLabel = wxGetStockLabel(id, wxSTOCK_NOFLAGS);
 
     if(!wxControl::Create(parent, id, palmPos, palmSize, style, validator, name))
         return false;
@@ -195,12 +196,14 @@ wxSize wxButtonBase::GetDefaultSize()
     return wxSize(36,12);
 }
 
-void wxButton::SetDefault()
+wxWindow *wxButton::SetDefault()
 {
-    FormType* form = GetParentForm();
+    FormType* form = (FormType* )GetParentForm();
     if(form==NULL)
-        return;
+        return NULL;
     FrmSetDefaultButtonID(form,GetId());
+
+    return wxButtonBase::SetDefault();
 }
 
 void wxButton::SetTmpDefault()
@@ -234,4 +237,3 @@ void wxButton::Command(wxCommandEvent &event)
 }
 
 #endif // wxUSE_BUTTON
-