Rename delegates to try and stop name clashes, probably with wxWebKitCtrl.

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

diff --git a/src/palmos/main.cpp b/src/palmos/main.cpp
index df38c0718e1b528d0bb5ac59d3546e2160cd8a97..7268bcc5f328ebc3f151e70e9e054f41baa6e7c6 100644 (file)
--- a/src/palmos/main.cpp
+++ b/src/palmos/main.cpp
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        palmos/main.cpp
+// Name:        src/palmos/main.cpp

 // Purpose:     wxEnter for Palm OS
 // Purpose:     wxEnter for Palm OS

-// Author:      William Osborne
+// Author:      William Osborne - minimal working wxPalmOS port

 // Modified by:
 // Created:     10/07/04
 // Modified by:
 // Created:     10/07/04

-// RCS-ID:      $Id: 
+// RCS-ID:      $Id$

 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation
-#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,8 +24,11 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#include "wx/event.h"
-#include "wx/app.h"
+#ifndef WX_PRECOMP
+    #include "wx/event.h"
+    #include "wx/app.h"
+#endif //WX_PRECOMP
+

 #include "wx/cmdline.h"
 
 #if wxUSE_GUI
 #include "wx/cmdline.h"
 
 #if wxUSE_GUI


@@ -44,23 +43,16 @@
 
 int wxEntry()
 {
 
 int wxEntry()
 {

-    /* There is no command line in PalmOS.  For now generate a fake arument 
+    /* There is no command line in PalmOS.  For now generate a fake argument

      * list.  Later this may be changed to reflect the application launch code
      */
      * list.  Later this may be changed to reflect the application launch code
      */

-    wxArrayString args;
-    int argc = args.GetCount();
-
-    // +1 here for the terminating NULL
+    static const int argc = 0;

     wxChar **argv = new wxChar *[argc + 1];
     wxChar **argv = new wxChar *[argc + 1];

-    for ( int i = 0; i < argc; i++ )
-    {
-        argv[i] = wxStrdup(args[i]);
-    }

 
     // argv[] must be NULL-terminated
     argv[argc] = NULL;
 
     // argv[] must be NULL-terminated
     argv[argc] = NULL;

-    
-    return wxEntry(argc, argv);
+
+    return wxEntry(const_cast<int>(argc), argv);

 }
 
 #endif // wxUSE_GUI
 }
 
 #endif // wxUSE_GUI