wxUSE_PROPGRID is now recognized by source and header files

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

diff --git a/src/palmos/button.cpp b/src/palmos/button.cpp
index c72fc9402ff7ee23b75c19a4ff8e14cea4aabe83..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,16 +26,24 @@
 
 #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/settings.h"
     #include "wx/dcscreen.h"
     #include "wx/brush.h"
     #include "wx/panel.h"
     #include "wx/bmpbuttn.h"
     #include "wx/settings.h"
     #include "wx/dcscreen.h"

+    #include "wx/frame.h"
+    #include "wx/dialog.h"

 #endif
 
 #endif
 

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

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


@@ -126,8 +130,51 @@ bool wxButton::Create(wxWindow *parent,
                       const wxValidator& validator,
                       const wxString& name)
 {
                       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, wxSTOCK_NOFLAGS);
+
+    if(!wxControl::Create(parent, id, palmPos, palmSize, style, validator, name))
+        return false;
+
+    return wxControl::PalmCreateControl(buttonCtl, palmLabel, palmPos, palmSize);

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


@@ -140,17 +187,25 @@ wxButton::~wxButton()
 
 wxSize wxButton::DoGetBestSize() const
 {
 
 wxSize wxButton::DoGetBestSize() const
 {

-    return wxSize(0,0);
+    return wxSize(36,12);

 }
 
 /* static */
 wxSize wxButtonBase::GetDefaultSize()
 {
 }
 
 /* static */
 wxSize wxButtonBase::GetDefaultSize()
 {

-    return wxSize(0,0);
+    return wxSize(36,12);

 }
 
 }
 

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

 {
 {

+    FormType* form = (FormType* )GetParentForm();
+    if(form==NULL)
+        return NULL;
+#ifdef __WXPALMOS6__
+    FrmSetDefaultButtonID(form,GetId());
+#endif // __WXPALMOS6__
+
+    return wxButtonBase::SetDefault();

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


@@ -173,12 +228,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

-