Make the margin between wxSpinCtrlGeneric sub-windows compatible with MSW.

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

diff --git a/src/palmos/app.cpp b/src/palmos/app.cpp
index 888ab4bf8cb005e678cad81460f8cbe3ef3c41ba..8ff97b1088be1eede7ac5b25fe3ab4348f7f6961 100644 (file)
--- a/src/palmos/app.cpp
+++ b/src/palmos/app.cpp
@@ -100,11 +100,6 @@ void *wxGUIAppTraits::BeforeChildWaitLoop()
     return NULL;
 }
 
     return NULL;
 }
 

-void wxGUIAppTraits::AlwaysYield()
-{
-    wxYield();
-}
-

 void wxGUIAppTraits::AfterChildWaitLoop(void *dataOrig)
 {
 }
 void wxGUIAppTraits::AfterChildWaitLoop(void *dataOrig)
 {
 }


@@ -120,10 +115,12 @@ wxPortId wxGUIAppTraits::GetToolkitVersion(int *majVer, int *minVer) const
     return wxPORT_PALMOS;
 }
 
     return wxPORT_PALMOS;
 }
 

+#if wxUSE_TIMER

 wxTimerImpl* wxGUIAppTraits::CreateTimerImpl(wxTimer *timer)
 {
     return new wxPalmOSTimerImpl(timer);
 };
 wxTimerImpl* wxGUIAppTraits::CreateTimerImpl(wxTimer *timer)
 {
     return new wxPalmOSTimerImpl(timer);
 };

+#endif // wxUSE_TIMER

 
 wxEventLoopBase* wxGUIAppTraits::CreateEventLoop()
 {
 
 wxEventLoopBase* wxGUIAppTraits::CreateEventLoop()
 {


@@ -212,8 +209,7 @@ void wxApp::CleanUp()
     // unregister the classes now
     UnregisterWindowClasses();
 
     // unregister the classes now
     UnregisterWindowClasses();
 

-    delete wxWinHandleHash;
-    wxWinHandleHash = NULL;
+    wxDELETE(wxWinHandleHash);

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


@@ -227,17 +223,21 @@ wxApp::wxApp()
 
 wxApp::~wxApp()
 {
 
 wxApp::~wxApp()
 {

+    wxChar **argv_tmp;
+    argv_tmp = argv;
+    // src/palmos/main.cpp

     // our cmd line arguments are allocated inside wxEntry(HINSTANCE), they
     // don't come from main(), so we have to free them
     // our cmd line arguments are allocated inside wxEntry(HINSTANCE), they
     // don't come from main(), so we have to free them

-

     while ( argc )
     {
         // m_argv elements were allocated by wxStrdup()
     while ( argc )
     {
         // m_argv elements were allocated by wxStrdup()

-        free(argv[--argc]);
+        if (argv_tmp[--argc]) {
+            free((void *)(argv_tmp[--argc]));
+        }

     }
     }

-

     // but m_argv itself -- using new[]
     // but m_argv itself -- using new[]

-    delete [] argv;
+    delete [] argv_tmp;
+    //argv = NULL;

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


@@ -279,13 +279,6 @@ int wxApp::GetComCtl32Version()
     return 0;
 }
 
     return 0;
 }
 

-// Yield to incoming messages
-
-bool wxApp::Yield(bool onlyIfNeeded)
-{
-    return true;
-}
-

 #if wxUSE_EXCEPTIONS
 
 // ----------------------------------------------------------------------------
 #if wxUSE_EXCEPTIONS
 
 // ----------------------------------------------------------------------------