cleanup - more reformatting; fixed bug introduced in prior commit

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

diff --git a/src/palmos/toplevel.cpp b/src/palmos/toplevel.cpp
index 0fe4043a0f2f1f8e069ed04343f030ecfc926c4a..2e0f479cbcaad2c2bad0d7e23208114e0008ceb5 100644 (file)
--- a/src/palmos/toplevel.cpp
+++ b/src/palmos/toplevel.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // 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"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -50,6 +46,9 @@
 #include "wx/slider.h"
 #include "wx/datectrl.h"
 
 #include "wx/slider.h"
 #include "wx/datectrl.h"
 

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

 // ----------------------------------------------------------------------------
 // globals
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // globals
 // ----------------------------------------------------------------------------


@@ -60,6 +59,8 @@ extern const wxChar *wxCanvasClassName;
 // Pointer to the currently active frame for the form event handler.
 wxTopLevelWindowPalm* ActiveParentFrame;
 
 // Pointer to the currently active frame for the form event handler.
 wxTopLevelWindowPalm* ActiveParentFrame;
 

+static Boolean FrameFormHandleEvent(EventType *event);
+

 // ============================================================================
 // wxTopLevelWindowPalm implementation
 // ============================================================================
 // ============================================================================
 // wxTopLevelWindowPalm implementation
 // ============================================================================


@@ -130,9 +131,9 @@ bool wxTopLevelWindowPalm::Create(wxWindow *parent,
     if(FrameForm==NULL)
         return false;
 
     if(FrameForm==NULL)
         return false;
 

-    FrmSetEventHandler(FrameForm,FrameFormHandleEvent);
+    FrmSetEventHandler((FormType *)FrameForm,FrameFormHandleEvent);

 
 

-    FrmSetActiveForm(FrameForm);
+    FrmSetActiveForm((FormType *)FrameForm);

 
     ActiveParentFrame=this;
 
 
     ActiveParentFrame=this;
 


@@ -149,10 +150,10 @@ wxTopLevelWindowPalm::~wxTopLevelWindowPalm()
 
 WXWINHANDLE wxTopLevelWindowPalm::GetWinHandle() const
 {
 
 WXWINHANDLE wxTopLevelWindowPalm::GetWinHandle() const
 {

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

     if(form)
         return FrmGetWindowHandle(form);
     if(form)
         return FrmGetWindowHandle(form);

-    return 0;
+    return NULL;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -165,7 +166,7 @@ void wxTopLevelWindowPalm::DoShowWindow(int nShowCmd)
 
 bool wxTopLevelWindowPalm::Show(bool show)
 {
 
 bool wxTopLevelWindowPalm::Show(bool show)
 {

-    FrmDrawForm(FrameForm);
+    FrmDrawForm((FormType *)FrameForm);

 
     wxPaintEvent event(m_windowId);
     event.SetEventObject(this);
 
     wxPaintEvent event(m_windowId);
     event.SetEventObject(this);


@@ -203,7 +204,7 @@ void wxTopLevelWindowPalm::Restore()
 void wxTopLevelWindowPalm::DoGetSize( int *width, int *height ) const
 {
     RectangleType rect;
 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)
     if(width)
         *width = rect.extent.x;
     if(height)


@@ -223,6 +224,15 @@ bool wxTopLevelWindowPalm::ShowFullScreen(bool show, long style)
 // wxTopLevelWindowPalm misc
 // ----------------------------------------------------------------------------
 
 // wxTopLevelWindowPalm misc
 // ----------------------------------------------------------------------------
 

+void wxTopLevelWindowPalm::SetTitle( const wxString& WXUNUSED(title))
+{
+}
+
+wxString wxTopLevelWindowPalm::GetTitle() const
+{
+    return wxEmptyString;
+}
+

 void wxTopLevelWindowPalm::SetIcon(const wxIcon& icon)
 {
 }
 void wxTopLevelWindowPalm::SetIcon(const wxIcon& icon)
 {
 }


@@ -236,7 +246,7 @@ bool wxTopLevelWindowPalm::EnableCloseButton(bool enable)
     return false;
 }
 
     return false;
 }
 

-FormType *wxTopLevelWindowPalm::GetForm() const
+WXFORMPTR wxTopLevelWindowPalm::GetForm() const

 {
     return FrmGetActiveForm();
 }
 {
     return FrmGetActiveForm();
 }


@@ -250,9 +260,10 @@ bool wxTopLevelWindowPalm::SetShape(const wxRegion& region)
 // wxTopLevelWindow native event handling
 // ----------------------------------------------------------------------------
 
 // 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)
 
     wxWindow* win = FindWindowById(id,this);
     if(win==NULL)


@@ -297,11 +308,12 @@ bool wxTopLevelWindowPalm::HandleControlSelect(EventType* event)
     return false;
 }
 
     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;
 
     if(win==NULL)
         return false;
 


@@ -314,10 +326,11 @@ bool wxTopLevelWindowPalm::HandleControlRepeat(EventType* event)
     return false;
 }
 
     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);
     wxSizeEvent eventWx(newSize,GetId());
     eventWx.SetEventObject(this);
     return GetEventHandler()->ProcessEvent(eventWx);


@@ -341,7 +354,7 @@ void wxTopLevelWindowPalm::OnActivate(wxActivateEvent& event)
  * finds a better solution, please let me know.  My email address is
  * wbo@freeshell.org
  */
  * 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
 {
     // frame and tlw point to the same object but they are for convenience
     // of calling proper structure withiout later dynamic typcasting