Applied [ 1867939 ] fixes for wxTreeCtrl crashes when exiting from label editing...

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

diff --git a/src/palmos/toplevel.cpp b/src/palmos/toplevel.cpp
index e1c6b75d3158e72dd162c0c1ecbf17ae959a5776..2863573c9e41294cd2c902ca078a8403600363fd 100644 (file)
--- a/src/palmos/toplevel.cpp
+++ b/src/palmos/toplevel.cpp
@@ -24,9 +24,10 @@
     #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/dialog.h"
     #include "wx/string.h"
     #include "wx/log.h"


@@ -35,15 +36,15 @@
     #include "wx/containr.h"        // wxSetFocusToChild()
     #include "wx/button.h"
     #include "wx/checkbox.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/radiobut.h"

 #include "wx/tglbtn.h"
 #include "wx/tglbtn.h"

-#include "wx/slider.h"

 #include "wx/datectrl.h"
 
 #include <Window.h>
 #include "wx/datectrl.h"
 
 #include <Window.h>


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

+    if (true != show) {
+           return true;
+    }

     FrmDrawForm((FormType *)FrameForm);
 
     wxPaintEvent event(m_windowId);
     event.SetEventObject(this);
     FrmDrawForm((FormType *)FrameForm);
 
     wxPaintEvent event(m_windowId);
     event.SetEventObject(this);

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

 
     return true;
 }
 
     return true;
 }


@@ -233,10 +237,6 @@ wxString wxTopLevelWindowPalm::GetTitle() const
     return wxEmptyString;
 }
 
     return wxEmptyString;
 }
 

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

 void wxTopLevelWindowPalm::SetIcons(const wxIconBundle& icons)
 {
 }
 void wxTopLevelWindowPalm::SetIcons(const wxIconBundle& icons)
 {
 }


@@ -333,7 +333,7 @@ bool wxTopLevelWindowPalm::HandleSize(WXEVENTPTR event)
                    palmEvent->data.winResized.newBounds.extent.y);
     wxSizeEvent eventWx(newSize,GetId());
     eventWx.SetEventObject(this);
                    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)
 }
 
 void wxTopLevelWindowPalm::OnActivate(wxActivateEvent& event)