Temporary fix for inconsistent menu item margins (see Quit item in ownerdraw sample)

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

diff --git a/src/palmos/toplevel.cpp b/src/palmos/toplevel.cpp
index 58fe1ddc4661615deafaf676665bb977a248a30f..0b1105aafce67e97ddaf1dcd255d2c0e78b56ef7 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,21 +24,32 @@
     #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"
 
 #include "wx/display.h"
 

+// controls for sending select event
+#include "wx/tglbtn.h"
+#include "wx/datectrl.h"
+
+#include <Window.h>
+#include <Form.h>
+

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


@@ -53,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
 // ============================================================================


@@ -74,11 +83,6 @@ WXDWORD wxTopLevelWindowPalm::PalmGetStyle(long style, WXDWORD *exflags) const
     return 0;
 }
 
     return 0;
 }
 

-WXHWND wxTopLevelWindowPalm::PalmGetParent() const
-{
-    return NULL;
-}
-

 bool wxTopLevelWindowPalm::Create(wxWindow *parent,
                                   wxWindowID id,
                                   const wxString& title,
 bool wxTopLevelWindowPalm::Create(wxWindow *parent,
                                   wxWindowID id,
                                   const wxString& title,


@@ -98,12 +102,14 @@ bool wxTopLevelWindowPalm::Create(wxWindow *parent,
     if ( parent )
         parent->AddChild(this);
 
     if ( parent )
         parent->AddChild(this);
 

-    m_windowId = id == wxID_ANY ? NewControlId() : id;
+    SetId( id == wxID_ANY ? NewControlId() : id );

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

+    // position

     constraints.x_pos = ( pos.x == wxDefaultCoord ) ? winUndefConstraint : pos.x;
     constraints.y_pos = ( pos.y == wxDefaultCoord ) ? winUndefConstraint : pos.y;
     constraints.x_pos = ( pos.x == wxDefaultCoord ) ? winUndefConstraint : pos.x;
     constraints.y_pos = ( pos.y == wxDefaultCoord ) ? winUndefConstraint : pos.y;

+    // size

     constraints.x_min = winUndefConstraint;
     constraints.x_max = winMaxConstraint;
     constraints.x_pref = ( size.x == wxDefaultCoord ) ? winUndefConstraint : size.x;
     constraints.x_min = winUndefConstraint;
     constraints.x_max = winMaxConstraint;
     constraints.x_pref = ( size.x == wxDefaultCoord ) ? winUndefConstraint : size.x;


@@ -112,7 +118,7 @@ bool wxTopLevelWindowPalm::Create(wxWindow *parent,
     constraints.y_pref = ( size.y == wxDefaultCoord ) ? winUndefConstraint : size.y;
 
     FrameForm = FrmNewFormWithConstraints(
     constraints.y_pref = ( size.y == wxDefaultCoord ) ? winUndefConstraint : size.y;
 
     FrameForm = FrmNewFormWithConstraints(

-                    m_windowId,
+                    GetId(),

                     title.c_str(),
                     winFlagBackBuffer,
                     &constraints,
                     title.c_str(),
                     winFlagBackBuffer,
                     &constraints,


@@ -126,9 +132,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;
 


@@ -139,6 +145,18 @@ wxTopLevelWindowPalm::~wxTopLevelWindowPalm()
 {
 }
 
 {
 }
 

+// ---------------------------------------------------------------------------
+// implementation
+// ---------------------------------------------------------------------------
+
+WXWINHANDLE wxTopLevelWindowPalm::GetWinHandle() const
+{
+    FormType *form = (FormType *)GetForm();
+    if(form)
+        return FrmGetWindowHandle(form);
+    return NULL;
+}
+

 // ----------------------------------------------------------------------------
 // wxTopLevelWindowPalm showing
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxTopLevelWindowPalm showing
 // ----------------------------------------------------------------------------


@@ -149,7 +167,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);


@@ -184,6 +202,16 @@ void wxTopLevelWindowPalm::Restore()
 {
 }
 
 {
 }
 

+void wxTopLevelWindowPalm::DoGetSize( int *width, int *height ) const
+{
+    RectangleType rect;
+    FrmGetFormBounds( (FormType *)GetForm() , &rect );
+    if(width)
+        *width = rect.extent.x;
+    if(height)
+        *height = rect.extent.y;
+}
+

 // ----------------------------------------------------------------------------
 // wxTopLevelWindowPalm fullscreen
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxTopLevelWindowPalm fullscreen
 // ----------------------------------------------------------------------------


@@ -197,6 +225,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)
 {
 }


@@ -210,24 +247,96 @@ bool wxTopLevelWindowPalm::EnableCloseButton(bool enable)
     return false;
 }
 
     return false;
 }
 

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

 {
 {

-    return FrmGetActiveForm ();
+    return FrmGetActiveForm();

 }
 
 }
 

-#ifndef __WXWINCE__
-

 bool wxTopLevelWindowPalm::SetShape(const wxRegion& region)
 {
     return false;
 }
 
 bool wxTopLevelWindowPalm::SetShape(const wxRegion& region)
 {
     return false;
 }
 

-#endif // !__WXWINCE__
-

 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------

-// wxTopLevelWindow event handling
+// wxTopLevelWindow native event handling

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

+bool wxTopLevelWindowPalm::HandleControlSelect(WXEVENTPTR event)
+{
+    const EventType *palmEvent = (EventType *)event;
+    const int id = palmEvent->data.ctlSelect.controlID;
+
+    wxWindow* win = FindWindowById(id,this);
+    if(win==NULL)
+        return false;
+
+#if wxUSE_BUTTON
+    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();
+#endif // wxUSE_CHECKBOX
+
+#if wxUSE_TOGGLEBTN
+    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();
+#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();
+#endif // wxUSE_SLIDER
+
+    return false;
+}
+
+bool wxTopLevelWindowPalm::HandleControlRepeat(WXEVENTPTR event)
+{
+    const EventType *palmEvent = (EventType *)event;
+    const int id = palmEvent->data.ctlRepeat.controlID;
+
+    wxWindow* win = FindWindowById(id, this);
+    if(win==NULL)
+        return false;
+
+#if wxUSE_SLIDER
+    wxSlider* slider = wxDynamicCast(win,wxSlider);
+    if(slider)
+        return slider->SendScrollEvent(event);
+#endif // wxUSE_SLIDER
+
+    return false;
+}
+
+bool wxTopLevelWindowPalm::HandleSize(WXEVENTPTR event)
+{
+    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);
+}
+

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


@@ -246,29 +355,35 @@ 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* pEvent)
+static Boolean FrameFormHandleEvent(EventType *event)

 {
 {

-    wxFrame*    frame = wxDynamicCast(ActiveParentFrame,wxFrame);
-    Boolean     fHandled = false;
-    FormType*   pForm;
-    WinHandle   hWindow;
-    int         ItemID=0;
+    // frame and tlw point to the same object but they are for convenience
+    // of calling proper structure withiout later dynamic typcasting
+    wxFrame* frame = wxDynamicCast(ActiveParentFrame,wxFrame);
+    wxTopLevelWindowPalm* tlw = ActiveParentFrame;
+    Boolean     handled = false;

 
 

-    switch (pEvent->eType) {
+    switch (event->eType) {

         case ctlSelectEvent:
         case ctlSelectEvent:

+            handled = tlw->HandleControlSelect(event);
+            break;
+        case ctlRepeatEvent:
+            handled = tlw->HandleControlRepeat(event);
+            break;
+        case winResizedEvent:
+            handled = tlw->HandleSize(event);

             break;
 #if wxUSE_MENUS_NATIVE
         case menuOpenEvent:
             break;
 #if wxUSE_MENUS_NATIVE
         case menuOpenEvent:

-            fHandled = frame->HandleMenuOpen();
+            handled = frame->HandleMenuOpen();

             break;
         case menuEvent:
             break;
         case menuEvent:

-            ItemID = pEvent->data.menu.itemID;
-            fHandled = frame->HandleMenuSelect(ItemID);
+            handled = frame->HandleMenuSelect(event);

             break;
 #endif
         default:
             break;
     }
 
             break;
 #endif
         default:
             break;
     }
 

-    return fHandled;
+    return handled;

 }
 }