Moved the main funtion into its own source file.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1257 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk.inc b/src/gtk.inc
index 31dca2714fa86b89de416eb137138ca0ded7d8c3..63d3aa69ede61d1fab08a4d06bdf5309d03b38ae 100644 (file)
--- a/src/gtk.inc
+++ b/src/gtk.inc
@@ -96,6 +96,7 @@ LIB_CPP_SRC=\
  gtk/gdiobj.cpp \
  gtk/icon.cpp \
  gtk/listbox.cpp \
  gtk/gdiobj.cpp \
  gtk/icon.cpp \
  gtk/listbox.cpp \

+ gtk/main.cpp \

  gtk/mdi.cpp \
  gtk/menu.cpp \
  gtk/minifram.cpp \
  gtk/mdi.cpp \
  gtk/menu.cpp \
  gtk/minifram.cpp \

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index 630733a3aecb2970f6dcd754556611c1ec0787a1..6337f7dc21fab18adb2b75e916a56c96229f78c1 100644 (file)
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -85,12 +85,12 @@ unsigned char g_palette[64*3] =
   0x75, 0x93, 0x4f,
   0x91, 0xae, 0x64,
   0xad, 0xc8, 0x7a,
   0x75, 0x93, 0x4f,
   0x91, 0xae, 0x64,
   0xad, 0xc8, 0x7a,

-  0xf0, 0xa8, 0xef, 
+  0xf0, 0xa8, 0xef,

   0xd0, 0x88, 0xd0,
   0xaf, 0x66, 0xaf,
   0x8e, 0x44, 0x8e,
   0x6d, 0x22, 0x6d,
   0xd0, 0x88, 0xd0,
   0xaf, 0x66, 0xaf,
   0x8e, 0x44, 0x8e,
   0x6d, 0x22, 0x6d,

-  0x4b, 0x0,  0x4b, 
+  0x4b, 0x0,  0x4b,

   0xff, 0xc0, 0xbc,
   0xff, 0x93, 0x91,
   0xff, 0x66, 0x67,
   0xff, 0xc0, 0xbc,
   0xff, 0x93, 0x91,
   0xff, 0x66, 0x67,


@@ -209,7 +209,7 @@ void wxApp::OnIdle( wxIdleEvent &event )
 bool wxApp::SendIdleEvents(void)
 {
     bool needMore = FALSE;
 bool wxApp::SendIdleEvents(void)
 {
     bool needMore = FALSE;

-    
+

     wxNode* node = wxTopLevelWindows.First();
     while (node)
     {
     wxNode* node = wxTopLevelWindows.First();
     while (node)
     {


@@ -326,7 +326,7 @@ void wxApp::CommonInit(void)
   wxInitializeResourceSystem();
 
   wxImage::InitStandardHandlers();
   wxInitializeResourceSystem();
 
   wxImage::InitStandardHandlers();

-  
+

 //  g_globalCursor = new wxCursor;
 }
 
 //  g_globalCursor = new wxCursor;
 }
 


@@ -343,7 +343,7 @@ void wxApp::CommonCleanUp(void)
     wxDeleteStockLists();
 
     wxCleanUpResourceSystem();
     wxDeleteStockLists();
 
     wxCleanUpResourceSystem();

-  
+

     wxImage::CleanUpHandlers();
 
     wxSystemSettings::Done();
     wxImage::CleanUpHandlers();
 
     wxSystemSettings::Done();


@@ -402,9 +402,9 @@ int wxEntry( int argc, char *argv[] )
     strcpy( name, wxFileNameFromPath(name) );
     wxStripExtension( name );
     wxTheApp->SetAppName( name );
     strcpy( name, wxFileNameFromPath(name) );
     wxStripExtension( name );
     wxTheApp->SetAppName( name );

-  
+

     gtk_set_locale();
     gtk_set_locale();

-  
+

     gtk_init( &argc, &argv );
 
     GdkColormap *cmap = gdk_colormap_new( gdk_visual_get_system(), TRUE );
     gtk_init( &argc, &argv );
 
     GdkColormap *cmap = gdk_colormap_new( gdk_visual_get_system(), TRUE );


@@ -416,19 +416,19 @@ int wxEntry( int argc, char *argv[] )
         col.green  = g_palette[i*3 + 1] << 8;
         col.blue   = g_palette[i*3 + 2] << 8;
         col.pixel  = 0;
         col.green  = g_palette[i*3 + 1] << 8;
         col.blue   = g_palette[i*3 + 2] << 8;
         col.pixel  = 0;

-    
+

         gdk_color_alloc( cmap, &col );
     }
         gdk_color_alloc( cmap, &col );
     }

-  
+

     gtk_widget_push_colormap( cmap );
     gtk_widget_push_colormap( cmap );

-  
+

     gtk_widget_set_default_colormap( cmap );
 
     wxApp::CommonInit();
 
     wxModule::RegisterModules();
     if (!wxModule::InitializeModules()) return FALSE;
     gtk_widget_set_default_colormap( cmap );
 
     wxApp::CommonInit();
 
     wxModule::RegisterModules();
     if (!wxModule::InitializeModules()) return FALSE;

-    
+

     wxTheApp->OnInitGui();
 
     // Here frames insert themselves automatically
     wxTheApp->OnInitGui();
 
     // Here frames insert themselves automatically


@@ -448,18 +448,18 @@ int wxEntry( int argc, char *argv[] )
     wxTheApp->OnExit();
 
     wxModule::CleanUpModules();
     wxTheApp->OnExit();
 
     wxModule::CleanUpModules();

-  
+

     wxApp::CommonCleanUp();
 
     delete wxTheApp;
     wxTheApp = (wxApp*) NULL;
 
     wxClassInfo::CleanUpClasses();
     wxApp::CommonCleanUp();
 
     delete wxTheApp;
     wxTheApp = (wxApp*) NULL;
 
     wxClassInfo::CleanUpClasses();

-  
+

     delete[] wxBuffer;
     delete[] wxBuffer;

-  
+

 #if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
 #if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT

-  
+

     if (wxDebugContext::CountObjectsLeft() > 0)
     {
         wxLogDebug("There were memory leaks.\n");
     if (wxDebugContext::CountObjectsLeft() > 0)
     {
         wxLogDebug("There were memory leaks.\n");


@@ -467,7 +467,7 @@ int wxEntry( int argc, char *argv[] )
         wxDebugContext::PrintStatistics();
     }
 //  wxDebugContext::SetStream(NULL, NULL);
         wxDebugContext::PrintStatistics();
     }
 //  wxDebugContext::SetStream(NULL, NULL);

-  
+

 #endif
 
     wxLog *oldLog = wxLog::SetActiveTarget( NULL );
 #endif
 
     wxLog *oldLog = wxLog::SetActiveTarget( NULL );


@@ -476,18 +476,8 @@ int wxEntry( int argc, char *argv[] )
     return retValue;
 }
 
     return retValue;
 }
 

-//-----------------------------------------------------------------------------
-// main()

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

-#if defined(AIX) || defined(AIX4) || defined(____HPUX__) || defined(NOMAIN)

 
 

- // main in IMPLEMENT_WX_MAIN in IMPLEMENT_APP in app.h
-
-#else
-
-  int main(int argc, char *argv[]) { return wxEntry(argc, argv); }
-
-#endif

 
 
 
 

diff --git a/src/gtk/main.cpp b/src/gtk/main.cpp
new file mode 100644 (file)
index 0000000..a6ea36c
--- /dev/null
+++ b/src/gtk/main.cpp
@@ -0,0 +1,29 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        main.cpp
+// Purpose:     Entry point
+// Author:      Julian Smart
+// Modified by:
+// Created:     17/09/98
+// RCS-ID:      $Id$
+// Copyright:   (c) Julian Smart
+// Licence:    wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#include "wx/app.h"
+
+int wxEntry(int argc, char *argv[]);
+
+
+#if defined(AIX) || defined(AIX4) || defined(____HPUX__) || defined(NOMAIN)
+
+  // main in IMPLEMENT_WX_MAIN in IMPLEMENT_APP in app.h
+
+#else
+
+
+int main(int argc, char* argv[])
+{
+  return wxEntry(argc, argv);
+}
+
+#endif

diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index 630733a3aecb2970f6dcd754556611c1ec0787a1..6337f7dc21fab18adb2b75e916a56c96229f78c1 100644 (file)
--- a/src/gtk1/app.cpp
+++ b/src/gtk1/app.cpp
@@ -85,12 +85,12 @@ unsigned char g_palette[64*3] =
   0x75, 0x93, 0x4f,
   0x91, 0xae, 0x64,
   0xad, 0xc8, 0x7a,
   0x75, 0x93, 0x4f,
   0x91, 0xae, 0x64,
   0xad, 0xc8, 0x7a,

-  0xf0, 0xa8, 0xef, 
+  0xf0, 0xa8, 0xef,

   0xd0, 0x88, 0xd0,
   0xaf, 0x66, 0xaf,
   0x8e, 0x44, 0x8e,
   0x6d, 0x22, 0x6d,
   0xd0, 0x88, 0xd0,
   0xaf, 0x66, 0xaf,
   0x8e, 0x44, 0x8e,
   0x6d, 0x22, 0x6d,

-  0x4b, 0x0,  0x4b, 
+  0x4b, 0x0,  0x4b,

   0xff, 0xc0, 0xbc,
   0xff, 0x93, 0x91,
   0xff, 0x66, 0x67,
   0xff, 0xc0, 0xbc,
   0xff, 0x93, 0x91,
   0xff, 0x66, 0x67,


@@ -209,7 +209,7 @@ void wxApp::OnIdle( wxIdleEvent &event )
 bool wxApp::SendIdleEvents(void)
 {
     bool needMore = FALSE;
 bool wxApp::SendIdleEvents(void)
 {
     bool needMore = FALSE;

-    
+

     wxNode* node = wxTopLevelWindows.First();
     while (node)
     {
     wxNode* node = wxTopLevelWindows.First();
     while (node)
     {


@@ -326,7 +326,7 @@ void wxApp::CommonInit(void)
   wxInitializeResourceSystem();
 
   wxImage::InitStandardHandlers();
   wxInitializeResourceSystem();
 
   wxImage::InitStandardHandlers();

-  
+

 //  g_globalCursor = new wxCursor;
 }
 
 //  g_globalCursor = new wxCursor;
 }
 


@@ -343,7 +343,7 @@ void wxApp::CommonCleanUp(void)
     wxDeleteStockLists();
 
     wxCleanUpResourceSystem();
     wxDeleteStockLists();
 
     wxCleanUpResourceSystem();

-  
+

     wxImage::CleanUpHandlers();
 
     wxSystemSettings::Done();
     wxImage::CleanUpHandlers();
 
     wxSystemSettings::Done();


@@ -402,9 +402,9 @@ int wxEntry( int argc, char *argv[] )
     strcpy( name, wxFileNameFromPath(name) );
     wxStripExtension( name );
     wxTheApp->SetAppName( name );
     strcpy( name, wxFileNameFromPath(name) );
     wxStripExtension( name );
     wxTheApp->SetAppName( name );

-  
+

     gtk_set_locale();
     gtk_set_locale();

-  
+

     gtk_init( &argc, &argv );
 
     GdkColormap *cmap = gdk_colormap_new( gdk_visual_get_system(), TRUE );
     gtk_init( &argc, &argv );
 
     GdkColormap *cmap = gdk_colormap_new( gdk_visual_get_system(), TRUE );


@@ -416,19 +416,19 @@ int wxEntry( int argc, char *argv[] )
         col.green  = g_palette[i*3 + 1] << 8;
         col.blue   = g_palette[i*3 + 2] << 8;
         col.pixel  = 0;
         col.green  = g_palette[i*3 + 1] << 8;
         col.blue   = g_palette[i*3 + 2] << 8;
         col.pixel  = 0;

-    
+

         gdk_color_alloc( cmap, &col );
     }
         gdk_color_alloc( cmap, &col );
     }

-  
+

     gtk_widget_push_colormap( cmap );
     gtk_widget_push_colormap( cmap );

-  
+

     gtk_widget_set_default_colormap( cmap );
 
     wxApp::CommonInit();
 
     wxModule::RegisterModules();
     if (!wxModule::InitializeModules()) return FALSE;
     gtk_widget_set_default_colormap( cmap );
 
     wxApp::CommonInit();
 
     wxModule::RegisterModules();
     if (!wxModule::InitializeModules()) return FALSE;

-    
+

     wxTheApp->OnInitGui();
 
     // Here frames insert themselves automatically
     wxTheApp->OnInitGui();
 
     // Here frames insert themselves automatically


@@ -448,18 +448,18 @@ int wxEntry( int argc, char *argv[] )
     wxTheApp->OnExit();
 
     wxModule::CleanUpModules();
     wxTheApp->OnExit();
 
     wxModule::CleanUpModules();

-  
+

     wxApp::CommonCleanUp();
 
     delete wxTheApp;
     wxTheApp = (wxApp*) NULL;
 
     wxClassInfo::CleanUpClasses();
     wxApp::CommonCleanUp();
 
     delete wxTheApp;
     wxTheApp = (wxApp*) NULL;
 
     wxClassInfo::CleanUpClasses();

-  
+

     delete[] wxBuffer;
     delete[] wxBuffer;

-  
+

 #if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
 #if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT

-  
+

     if (wxDebugContext::CountObjectsLeft() > 0)
     {
         wxLogDebug("There were memory leaks.\n");
     if (wxDebugContext::CountObjectsLeft() > 0)
     {
         wxLogDebug("There were memory leaks.\n");


@@ -467,7 +467,7 @@ int wxEntry( int argc, char *argv[] )
         wxDebugContext::PrintStatistics();
     }
 //  wxDebugContext::SetStream(NULL, NULL);
         wxDebugContext::PrintStatistics();
     }
 //  wxDebugContext::SetStream(NULL, NULL);

-  
+

 #endif
 
     wxLog *oldLog = wxLog::SetActiveTarget( NULL );
 #endif
 
     wxLog *oldLog = wxLog::SetActiveTarget( NULL );


@@ -476,18 +476,8 @@ int wxEntry( int argc, char *argv[] )
     return retValue;
 }
 
     return retValue;
 }
 

-//-----------------------------------------------------------------------------
-// main()

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

-#if defined(AIX) || defined(AIX4) || defined(____HPUX__) || defined(NOMAIN)

 
 

- // main in IMPLEMENT_WX_MAIN in IMPLEMENT_APP in app.h
-
-#else
-
-  int main(int argc, char *argv[]) { return wxEntry(argc, argv); }
-
-#endif

 
 
 
 

diff --git a/src/gtk1/main.cpp b/src/gtk1/main.cpp
new file mode 100644 (file)
index 0000000..a6ea36c
--- /dev/null
+++ b/src/gtk1/main.cpp
@@ -0,0 +1,29 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        main.cpp
+// Purpose:     Entry point
+// Author:      Julian Smart
+// Modified by:
+// Created:     17/09/98
+// RCS-ID:      $Id$
+// Copyright:   (c) Julian Smart
+// Licence:    wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#include "wx/app.h"
+
+int wxEntry(int argc, char *argv[]);
+
+
+#if defined(AIX) || defined(AIX4) || defined(____HPUX__) || defined(NOMAIN)
+
+  // main in IMPLEMENT_WX_MAIN in IMPLEMENT_APP in app.h
+
+#else
+
+
+int main(int argc, char* argv[])
+{
+  return wxEntry(argc, argv);
+}
+
+#endif