X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6a27c749b302e17446080bb232ef8010b60f3d00..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/src/palmos/toplevel.cpp

diff --git a/src/palmos/toplevel.cpp b/src/palmos/toplevel.cpp
index 0fe4043a0f..8f28b50904 100644
--- a/src/palmos/toplevel.cpp
+++ b/src/palmos/toplevel.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "toplevel.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -28,28 +24,32 @@
     #pragma hdrstop
 #endif
 
+#include "wx/toplevel.h"
+
 #ifndef WX_PRECOMP
     #include "wx/app.h"
-    #include "wx/toplevel.h"
     #include "wx/dialog.h"
     #include "wx/string.h"
     #include "wx/log.h"
     #include "wx/intl.h"
     #include "wx/frame.h"
     #include "wx/containr.h"        // wxSetFocusToChild()
+    #include "wx/button.h"
+    #include "wx/checkbox.h"
+    #include "wx/radiobut.h"
+    #include "wx/slider.h"
+    #include "wx/module.h"
 #endif //WX_PRECOMP
 
-#include "wx/module.h"
 #include "wx/display.h"
 
 // controls for sending select event
-#include "wx/button.h"
-#include "wx/checkbox.h"
-#include "wx/radiobut.h"
 #include "wx/tglbtn.h"
-#include "wx/slider.h"
 #include "wx/datectrl.h"
 
+#include <Window.h>
+#include <Form.h>
+
 // ----------------------------------------------------------------------------
 // globals
 // ----------------------------------------------------------------------------
@@ -60,6 +60,8 @@ extern const wxChar *wxCanvasClassName;
 // Pointer to the currently active frame for the form event handler.
 wxTopLevelWindowPalm* ActiveParentFrame;
 
+static Boolean FrameFormHandleEvent(EventType *event);
+
 // ============================================================================
 // wxTopLevelWindowPalm implementation
 // ============================================================================
@@ -130,9 +132,9 @@ bool wxTopLevelWindowPalm::Create(wxWindow *parent,
     if(FrameForm==NULL)
         return false;
 
-    FrmSetEventHandler(FrameForm,FrameFormHandleEvent);
+    FrmSetEventHandler((FormType *)FrameForm,FrameFormHandleEvent);
 
-    FrmSetActiveForm(FrameForm);
+    FrmSetActiveForm((FormType *)FrameForm);
 
     ActiveParentFrame=this;
 
@@ -149,10 +151,10 @@ wxTopLevelWindowPalm::~wxTopLevelWindowPalm()
 
 WXWINHANDLE wxTopLevelWindowPalm::GetWinHandle() const
 {
-    FormType *form = GetForm();
+    FormType *form = (FormType *)GetForm();
     if(form)
         return FrmGetWindowHandle(form);
-    return 0;
+    return NULL;
 }
 
 // ----------------------------------------------------------------------------
@@ -165,11 +167,11 @@ void wxTopLevelWindowPalm::DoShowWindow(int nShowCmd)
 
 bool wxTopLevelWindowPalm::Show(bool show)
 {
-    FrmDrawForm(FrameForm);
+    FrmDrawForm((FormType *)FrameForm);
 
     wxPaintEvent event(m_windowId);
     event.SetEventObject(this);
-    GetEventHandler()->ProcessEvent(event);
+    HandleWindowEvent(event);
 
     return true;
 }
@@ -203,7 +205,7 @@ void wxTopLevelWindowPalm::Restore()
 void wxTopLevelWindowPalm::DoGetSize( int *width, int *height ) const
 {
     RectangleType rect;
-    FrmGetFormBounds( GetForm() , &rect );
+    FrmGetFormBounds( (FormType *)GetForm() , &rect );
     if(width)
         *width = rect.extent.x;
     if(height)
@@ -223,10 +225,15 @@ bool wxTopLevelWindowPalm::ShowFullScreen(bool show, long style)
 // wxTopLevelWindowPalm misc
 // ----------------------------------------------------------------------------
 
-void wxTopLevelWindowPalm::SetIcon(const wxIcon& icon)
+void wxTopLevelWindowPalm::SetTitle( const wxString& WXUNUSED(title))
 {
 }
 
+wxString wxTopLevelWindowPalm::GetTitle() const
+{
+    return wxEmptyString;
+}
+
 void wxTopLevelWindowPalm::SetIcons(const wxIconBundle& icons)
 {
 }
@@ -236,7 +243,7 @@ bool wxTopLevelWindowPalm::EnableCloseButton(bool enable)
     return false;
 }
 
-FormType *wxTopLevelWindowPalm::GetForm() const
+WXFORMPTR wxTopLevelWindowPalm::GetForm() const
 {
     return FrmGetActiveForm();
 }
@@ -250,9 +257,10 @@ bool wxTopLevelWindowPalm::SetShape(const wxRegion& region)
 // wxTopLevelWindow native event handling
 // ----------------------------------------------------------------------------
 
-bool wxTopLevelWindowPalm::HandleControlSelect(EventType* event)
+bool wxTopLevelWindowPalm::HandleControlSelect(WXEVENTPTR event)
 {
-    int id = event->data.ctlSelect.controlID;
+    const EventType *palmEvent = (EventType *)event;
+    const int id = palmEvent->data.ctlSelect.controlID;
 
     wxWindow* win = FindWindowById(id,this);
     if(win==NULL)
@@ -297,11 +305,12 @@ bool wxTopLevelWindowPalm::HandleControlSelect(EventType* event)
     return false;
 }
 
-bool wxTopLevelWindowPalm::HandleControlRepeat(EventType* event)
+bool wxTopLevelWindowPalm::HandleControlRepeat(WXEVENTPTR event)
 {
-    int id = event->data.ctlRepeat.controlID;
+    const EventType *palmEvent = (EventType *)event;
+    const int id = palmEvent->data.ctlRepeat.controlID;
 
-    wxWindow* win = FindWindowById(id,this);
+    wxWindow* win = FindWindowById(id, this);
     if(win==NULL)
         return false;
 
@@ -314,13 +323,14 @@ bool wxTopLevelWindowPalm::HandleControlRepeat(EventType* event)
     return false;
 }
 
-bool wxTopLevelWindowPalm::HandleSize(EventType* event)
+bool wxTopLevelWindowPalm::HandleSize(WXEVENTPTR event)
 {
-    wxSize newSize(event->data.winResized.newBounds.extent.x,
-                   event->data.winResized.newBounds.extent.y);
+    const EventType *palmEvent = (EventType *)event;
+    wxSize newSize(palmEvent->data.winResized.newBounds.extent.x,
+                   palmEvent->data.winResized.newBounds.extent.y);
     wxSizeEvent eventWx(newSize,GetId());
     eventWx.SetEventObject(this);
-    return GetEventHandler()->ProcessEvent(eventWx);
+    return HandleWindowEvent(eventWx);
 }
 
 void wxTopLevelWindowPalm::OnActivate(wxActivateEvent& event)
@@ -341,7 +351,7 @@ void wxTopLevelWindowPalm::OnActivate(wxActivateEvent& event)
  * finds a better solution, please let me know.  My email address is
  * wbo@freeshell.org
  */
-static Boolean FrameFormHandleEvent(EventType* event)
+static Boolean FrameFormHandleEvent(EventType *event)
 {
     // frame and tlw point to the same object but they are for convenience
     // of calling proper structure withiout later dynamic typcasting