Fix UseUintMax definition used by wxAny for VC6.

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

diff --git a/src/palmos/toplevel.cpp b/src/palmos/toplevel.cpp
index 6e624442284cef55e55aa15b5544183107bf8963..643d0dcc55d679a684277178bd361b14320f8b05 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"
 


@@ -28,26 +24,31 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/toplevel.h"
+

 #ifndef WX_PRECOMP
     #include "wx/app.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/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
 
 #endif //WX_PRECOMP
 

-#include "wx/module.h"

 #include "wx/display.h"
 
 // controls for sending select event
 #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/tglbtn.h"

-#include "wx/slider.h"
+#include "wx/datectrl.h"
+
+#include <Window.h>
+#include <Form.h>

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


@@ -59,6 +60,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
 // ============================================================================


@@ -89,18 +92,21 @@ bool wxTopLevelWindowPalm::Create(wxWindow *parent,
                                   const wxString& name)
 {
     // this is a check for limitation mentioned before FrameFormHandleEvent() code
                                   const wxString& name)
 {
     // this is a check for limitation mentioned before FrameFormHandleEvent() code

-    if(wxTopLevelWindows.GetCount()>0)
+    if(wxTopLevelWindows.GetCount() > 0) {

         return false;
         return false;

+    }

 
     ActiveParentFrame=NULL;
 
     wxTopLevelWindows.Append(this);
 
 
     ActiveParentFrame=NULL;
 
     wxTopLevelWindows.Append(this);
 

-    if ( parent )
+    if ( parent ) {

         parent->AddChild(this);
         parent->AddChild(this);

+    }

 
     SetId( id == wxID_ANY ? NewControlId() : id );
 
 
     SetId( id == wxID_ANY ? NewControlId() : id );
 

+#ifdef __WXPALMOS6__

     WinConstraintsType constraints;
     memset(&constraints, 0, sizeof(WinConstraintsType));
     // position
     WinConstraintsType constraints;
     memset(&constraints, 0, sizeof(WinConstraintsType));
     // position


@@ -113,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;
     constraints.y_min = winUndefConstraint;
     constraints.y_max = winMaxConstraint;
     constraints.y_pref = ( size.y == wxDefaultCoord ) ? winUndefConstraint : size.y;

-

     FrameForm = FrmNewFormWithConstraints(
                     GetId(),
                     title.c_str(),
     FrameForm = FrmNewFormWithConstraints(
                     GetId(),
                     title.c_str(),


@@ -125,13 +130,24 @@ bool wxTopLevelWindowPalm::Create(wxWindow *parent,
                     NULL,
                     0
                 );
                     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;
         return false;

+    }

 
 

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

 
 

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

 
     ActiveParentFrame=this;
 
 
     ActiveParentFrame=this;
 


@@ -148,10 +164,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;

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


@@ -164,11 +180,14 @@ void wxTopLevelWindowPalm::DoShowWindow(int nShowCmd)
 
 bool wxTopLevelWindowPalm::Show(bool show)
 {
 
 bool wxTopLevelWindowPalm::Show(bool show)
 {

-    FrmDrawForm(FrameForm);
+    if (true != show) {
+        return true;
+    }
+    FrmDrawForm((FormType *)FrameForm);

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

-    GetEventHandler()->ProcessEvent(event);
+    HandleWindowEvent(event);

 
     return true;
 }
 
     return true;
 }


@@ -202,7 +221,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)


@@ -222,8 +241,13 @@ bool wxTopLevelWindowPalm::ShowFullScreen(bool show, long style)
 // wxTopLevelWindowPalm misc
 // ----------------------------------------------------------------------------
 
 // 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)
 }
 
 void wxTopLevelWindowPalm::SetIcons(const wxIconBundle& icons)


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

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

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


@@ -249,59 +273,85 @@ 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)
         return false;
 
 
     wxWindow* win = FindWindowById(id,this);
     if(win==NULL)
         return false;
 

+#if wxUSE_BUTTON

     wxButton* button = wxDynamicCast(win,wxButton);
     if(button)
         return button->SendClickEvent();
     wxButton* button = wxDynamicCast(win,wxButton);
     if(button)
         return button->SendClickEvent();

+#endif // wxUSE_BUTTON

 
 

+#if wxUSE_CHECKBOX

     wxCheckBox* checkbox = wxDynamicCast(win,wxCheckBox);
     if(checkbox)
         return checkbox->SendClickEvent();
     wxCheckBox* checkbox = wxDynamicCast(win,wxCheckBox);
     if(checkbox)
         return checkbox->SendClickEvent();

+#endif // wxUSE_CHECKBOX

 
 

+#if wxUSE_TOGGLEBTN

     wxToggleButton* toggle = wxDynamicCast(win,wxToggleButton);
     if(toggle)
         return toggle->SendClickEvent();
     wxToggleButton* toggle = wxDynamicCast(win,wxToggleButton);
     if(toggle)
         return toggle->SendClickEvent();

+#endif // wxUSE_TOGGLEBTN

 
 

+#if wxUSE_RADIOBTN

     wxRadioButton* radio = wxDynamicCast(win,wxRadioButton);
     if(radio)
         return radio->SendClickEvent();
     wxRadioButton* radio = wxDynamicCast(win,wxRadioButton);
     if(radio)
         return radio->SendClickEvent();

+#endif // wxUSE_RADIOBTN

 
 

+#if wxUSE_DATEPICKCTRL
+    wxDatePickerCtrl* datepicker = wxDynamicCast(win,wxDatePickerCtrl);
+    if(datepicker)
+        return datepicker->SendClickEvent();
+#endif // wxUSE_DATEPICKCTRL
+
+#if wxUSE_SLIDER

     wxSlider* slider = wxDynamicCast(win,wxSlider);
     if(slider)
         return slider->SendUpdatedEvent();
     wxSlider* slider = wxDynamicCast(win,wxSlider);
     if(slider)
         return slider->SendUpdatedEvent();

+#endif // wxUSE_SLIDER

 
     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;
 

+#if wxUSE_SLIDER

     wxSlider* slider = wxDynamicCast(win,wxSlider);
     if(slider)
         return slider->SendScrollEvent(event);
     wxSlider* slider = wxDynamicCast(win,wxSlider);
     if(slider)
         return slider->SendScrollEvent(event);

+#endif // wxUSE_SLIDER

 
     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);
+#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);
     wxSizeEvent eventWx(newSize,GetId());
     eventWx.SetEventObject(this);

-    return GetEventHandler()->ProcessEvent(eventWx);
+    return HandleWindowEvent(eventWx);
+#else // __WXPALMOS5__
+    return false;
+#endif
+

 }
 
 void wxTopLevelWindowPalm::OnActivate(wxActivateEvent& event)
 }
 
 void wxTopLevelWindowPalm::OnActivate(wxActivateEvent& event)


@@ -322,7 +372,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


@@ -337,9 +387,11 @@ static Boolean FrameFormHandleEvent(EventType* event)
         case ctlRepeatEvent:
             handled = tlw->HandleControlRepeat(event);
             break;
         case ctlRepeatEvent:
             handled = tlw->HandleControlRepeat(event);
             break;

+#ifdef __WXPALMOS6__

         case winResizedEvent:
             handled = tlw->HandleSize(event);
             break;
         case winResizedEvent:
             handled = tlw->HandleSize(event);
             break;

+#endif // __WXPALMOS6__

 #if wxUSE_MENUS_NATIVE
         case menuOpenEvent:
             handled = frame->HandleMenuOpen();
 #if wxUSE_MENUS_NATIVE
         case menuOpenEvent:
             handled = frame->HandleMenuOpen();