X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0ab48d64054e5ec00f908ae3df2648ba4ce17dfe..982d7f931701e2d65182f798e9182139efd67ed7:/src/palmos/toplevel.cpp?ds=inline

diff --git a/src/palmos/toplevel.cpp b/src/palmos/toplevel.cpp
index 2e0f479cbc..643d0dcc55 100644
--- a/src/palmos/toplevel.cpp
+++ b/src/palmos/toplevel.cpp
@@ -24,26 +24,27 @@
     #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>
@@ -91,18 +92,21 @@ bool wxTopLevelWindowPalm::Create(wxWindow *parent,
                                   const wxString& name)
 {
     // this is a check for limitation mentioned before FrameFormHandleEvent() code
-    if(wxTopLevelWindows.GetCount()>0)
+    if(wxTopLevelWindows.GetCount() > 0) {
         return false;
+    }
 
     ActiveParentFrame=NULL;
 
     wxTopLevelWindows.Append(this);
 
-    if ( parent )
+    if ( parent ) {
         parent->AddChild(this);
+    }
 
     SetId( id == wxID_ANY ? NewControlId() : id );
 
+#ifdef __WXPALMOS6__
     WinConstraintsType constraints;
     memset(&constraints, 0, sizeof(WinConstraintsType));
     // position
@@ -115,7 +119,6 @@ bool wxTopLevelWindowPalm::Create(wxWindow *parent,
     constraints.y_min = winUndefConstraint;
     constraints.y_max = winMaxConstraint;
     constraints.y_pref = ( size.y == wxDefaultCoord ) ? winUndefConstraint : size.y;
-
     FrameForm = FrmNewFormWithConstraints(
                     GetId(),
                     title.c_str(),
@@ -127,11 +130,22 @@ bool wxTopLevelWindowPalm::Create(wxWindow *parent,
                     NULL,
                     0
                 );
-
-    if(FrameForm==NULL)
+#else // __WXPALMOS5__
+#define winUndefConstraint 0xFFFF
+#define winMaxConstraint   288
+    // FormType *FrmNewForm (UInt16 formID, const Char *titleStrP, Coord x, Coord y, Coord width, Coord height,
+    //     Boolean modal, UInt16 defaultButton, UInt16 helpRscID, UInt16 menuRscID);
+    FrameForm = FrmNewForm (GetId(), title.c_str(),
+                    (( pos.x == wxDefaultCoord ) ? winUndefConstraint : pos.x),
+                    (( pos.y == wxDefaultCoord ) ? winUndefConstraint : pos.y),
+                    winMaxConstraint, winMaxConstraint,
+                    false, 0, 0, 0);
+#endif
+    if(NULL == FrameForm) {
         return false;
+    }
 
-    FrmSetEventHandler((FormType *)FrameForm,FrameFormHandleEvent);
+    FrmSetEventHandler((FormType *)FrameForm, FrameFormHandleEvent);
 
     FrmSetActiveForm((FormType *)FrameForm);
 
@@ -166,11 +180,14 @@ void wxTopLevelWindowPalm::DoShowWindow(int nShowCmd)
 
 bool wxTopLevelWindowPalm::Show(bool show)
 {
+    if (true != show) {
+        return true;
+    }
     FrmDrawForm((FormType *)FrameForm);
 
     wxPaintEvent event(m_windowId);
     event.SetEventObject(this);
-    GetEventHandler()->ProcessEvent(event);
+    HandleWindowEvent(event);
 
     return true;
 }
@@ -233,10 +250,6 @@ wxString wxTopLevelWindowPalm::GetTitle() const
     return wxEmptyString;
 }
 
-void wxTopLevelWindowPalm::SetIcon(const wxIcon& icon)
-{
-}
-
 void wxTopLevelWindowPalm::SetIcons(const wxIconBundle& icons)
 {
 }
@@ -328,12 +341,17 @@ bool wxTopLevelWindowPalm::HandleControlRepeat(WXEVENTPTR event)
 
 bool wxTopLevelWindowPalm::HandleSize(WXEVENTPTR event)
 {
+#ifdef __WXPALMOS6__
     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);
+#else // __WXPALMOS5__
+    return false;
+#endif
+
 }
 
 void wxTopLevelWindowPalm::OnActivate(wxActivateEvent& event)
@@ -369,9 +387,11 @@ static Boolean FrameFormHandleEvent(EventType *event)
         case ctlRepeatEvent:
             handled = tlw->HandleControlRepeat(event);
             break;
+#ifdef __WXPALMOS6__
         case winResizedEvent:
             handled = tlw->HandleSize(event);
             break;
+#endif // __WXPALMOS6__
 #if wxUSE_MENUS_NATIVE
         case menuOpenEvent:
             handled = frame->HandleMenuOpen();