No longer use semi-static IDs for wxPropertyGrid embedded controls and tool bar tools.

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

diff --git a/src/palmos/button.cpp b/src/palmos/button.cpp
index f8ec74481c13eba54fddd0d3eb7104f65fc6574f..93fd0d6690e478d9b57c724a195e1b7682e8b16b 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"
 


@@ -30,9 +26,10 @@
 
 #if wxUSE_BUTTON
 
 
 #if wxUSE_BUTTON
 

+#include "wx/button.h"
+

 #ifndef WX_PRECOMP
     #include "wx/app.h"
 #ifndef WX_PRECOMP
     #include "wx/app.h"

-    #include "wx/button.h"

     #include "wx/brush.h"
     #include "wx/panel.h"
     #include "wx/bmpbuttn.h"
     #include "wx/brush.h"
     #include "wx/panel.h"
     #include "wx/bmpbuttn.h"


@@ -44,6 +41,9 @@
 
 #include "wx/stockitem.h"
 
 
 #include "wx/stockitem.h"
 

+#include <Control.h>
+#include <Form.h>
+

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


@@ -138,7 +138,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() )
         {


@@ -148,14 +148,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;
         }


@@ -169,7 +169,7 @@ 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, false);
+        palmLabel = wxGetStockLabel(id, wxSTOCK_NOFLAGS);

 
     if(!wxControl::Create(parent, id, palmPos, palmSize, style, validator, name))
         return false;
 
     if(!wxControl::Create(parent, id, palmPos, palmSize, style, validator, name))
         return false;


@@ -196,12 +196,16 @@ wxSize wxButtonBase::GetDefaultSize()
     return wxSize(36,12);
 }
 
     return wxSize(36,12);
 }
 

-void wxButton::SetDefault()
+wxWindow *wxButton::SetDefault()

 {
 {

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

     if(form==NULL)
     if(form==NULL)

-        return;
+        return NULL;
+#ifdef __WXPALMOS6__

     FrmSetDefaultButtonID(form,GetId());
     FrmSetDefaultButtonID(form,GetId());

+#endif // __WXPALMOS6__
+
+    return wxButtonBase::SetDefault();

 }
 
 void wxButton::SetTmpDefault()
 }
 
 void wxButton::SetTmpDefault()


@@ -235,4 +239,3 @@ void wxButton::Command(wxCommandEvent &event)
 }
 
 #endif // wxUSE_BUTTON
 }
 
 #endif // wxUSE_BUTTON

-