X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/be4e4e27aa09c5ed35c784ce8e2067070bc7d00c..0d90d6ea7a007332aa75779f90b30ed39872e494:/src/palmos/frame.cpp diff --git a/src/palmos/frame.cpp b/src/palmos/frame.cpp index 6015a059d3..631d1ae7d5 100644 --- a/src/palmos/frame.cpp +++ b/src/palmos/frame.cpp @@ -57,6 +57,9 @@ #include "wx/univ/colschem.h" #endif // __WXUNIVERSAL__ +#include +#include + // ---------------------------------------------------------------------------- // globals // ---------------------------------------------------------------------------- @@ -70,7 +73,6 @@ // ---------------------------------------------------------------------------- BEGIN_EVENT_TABLE(wxFrame, wxFrameBase) - EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged) EVT_PAINT(wxFrame::OnPaint) END_EVENT_TABLE() @@ -212,15 +214,16 @@ bool wxFrame::HandleMenuOpen() return true; } -bool wxFrame::HandleMenuSelect(EventType* event) +bool wxFrame::HandleMenuSelect(WXEVENTPTR event) { - int ItemID = event->data.menu.itemID; + const EventType *palmEvent = (EventType *)event; + const int ItemID = palmEvent->data.menu.itemID; if (!m_frameMenuBar) return false; - int item=m_frameMenuBar->ProcessCommand(ItemID); - if(item==-1) + const int item = m_frameMenuBar->ProcessCommand(ItemID); + if (item==-1) return false; wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, item); @@ -232,11 +235,6 @@ bool wxFrame::HandleMenuSelect(EventType* event) #endif // wxUSE_MENUS_NATIVE -// Responds to colour changes, and passes event on to children. -void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event) -{ -} - void wxFrame::OnPaint(wxPaintEvent& event) { #if wxUSE_STATUSBAR @@ -279,24 +277,6 @@ void wxFrame::IconizeChildFrames(bool bIconize) { } -// =========================================================================== -// message processing -// =========================================================================== - -// --------------------------------------------------------------------------- -// our private (non virtual) message handlers -// --------------------------------------------------------------------------- - -bool wxFrame::HandlePaint() -{ - return false; -} - -bool wxFrame::HandleSize(int x, int y, WXUINT id) -{ - return false; -} - // ---------------------------------------------------------------------------- // wxFrame size management: we exclude the areas taken by menu/status/toolbars // from the client area, so the client area is what's really available for the @@ -313,7 +293,7 @@ wxPoint wxFrame::GetClientAreaOrigin() const Y = 0; while ( Y < maxY ) { - if(!FrmPointInTitle(GetForm(),X,Y)) + if(!FrmPointInTitle((FormType*)GetForm(),X,Y)) return wxPoint(X,Y+1); Y++; }