X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4055ed8281971e3d35bf04177193c27043d42ed1..8946ede10c2702c7acbb194fe8bd2793d7fb8358:/src/palmos/button.cpp?ds=sidebyside diff --git a/src/palmos/button.cpp b/src/palmos/button.cpp index 33edcfd45c..93fd0d6690 100644 --- a/src/palmos/button.cpp +++ b/src/palmos/button.cpp @@ -1,11 +1,11 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: palmos/button.cpp +// Name: src/palmos/button.cpp // Purpose: wxButton -// Author: William Osborne -// Modified by: +// Author: William Osborne - minimal working wxPalmOS port +// Modified by: Wlodzimierz ABX Skiba - native wxButton implementation // Created: 10/13/04 -// RCS-ID: $Id: -// Copyright: (c) William Osborne +// RCS-ID: $Id$ +// Copyright: (c) William Osborne, Wlodzimierz Skiba // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -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,17 +26,23 @@ #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" #include "wx/settings.h" #include "wx/dcscreen.h" + #include "wx/frame.h" + #include "wx/dialog.h" #endif -#include "wx/palmos/private.h" +#include "wx/stockitem.h" + +#include +#include // ---------------------------------------------------------------------------- // macros @@ -128,39 +130,82 @@ bool wxButton::Create(wxWindow *parent, const wxValidator& validator, const wxString& name) { - return false; + // 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() { } -// ---------------------------------------------------------------------------- -// 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() +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() @@ -183,21 +228,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 -