X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0cf2cb360f2ed60757a7c135f216495c3cc7b29b..41dee9d0ce93989c03848ebd7fc21fb402d4c247:/src/gtk1/app.cpp diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp index 11ab9c284f..f65ab8ecaf 100644 --- a/src/gtk1/app.cpp +++ b/src/gtk1/app.cpp @@ -2,9 +2,8 @@ // Name: app.cpp // Purpose: // Author: Robert Roebling -// Created: 01/02/97 -// Id: -// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem +// Id: $Id$ +// Copyright: (c) 1998 Robert Roebling, Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -15,7 +14,6 @@ #include "wx/app.h" #include "wx/gdicmn.h" #include "wx/utils.h" -#include "wx/postscrp.h" #include "wx/intl.h" #include "wx/log.h" #include "wx/memory.h" @@ -25,20 +23,84 @@ #include "unistd.h" -#ifdef USE_GDK_IMLIB -#include "../gdk_imlib/gdk_imlib.h" -#endif - //----------------------------------------------------------------------------- // global data //----------------------------------------------------------------------------- -wxApp *wxTheApp = NULL; +wxApp *wxTheApp = (wxApp *) NULL; wxAppInitializerFunction wxApp::m_appInitFn = (wxAppInitializerFunction) NULL; extern wxList wxPendingDelete; extern wxResourceCache *wxTheResourceCache; +unsigned char g_palette[64*3] = +{ + 0x0, 0x0, 0x0, + 0xff, 0xff, 0xff, + 0xff, 0x0, 0x0, + 0xff, 0xff, 0x0, + 0x0, 0xff, 0x0, + 0x0, 0x0, 0xff, + 0x0, 0xff, 0xff, + 0x99, 0x99, 0x99, + 0xff, 0x88, 0x0, + 0x88, 0x0, 0x0, + 0x0, 0x88, 0x88, + 0x88, 0x88, 0x0, + 0xff, 0xcc, 0x97, + 0xbb, 0xbb, 0xbb, + 0x9f, 0x6b, 0x42, + 0x55, 0x55, 0x55, + 0xdd, 0xdd, 0xdd, + 0x77, 0x77, 0x77, + 0x33, 0x33, 0x33, + 0xcc, 0x0, 0x0, + 0xff, 0x44, 0x0, + 0xff, 0xcc, 0x0, + 0xcc, 0xcc, 0x0, + 0x60, 0x60, 0x0, + 0x0, 0x43, 0x0, + 0x0, 0x7f, 0x0, + 0x0, 0xcc, 0x0, + 0x0, 0x44, 0x44, + 0x0, 0x0, 0x44, + 0x0, 0x0, 0x88, + 0xef, 0xb1, 0x7b, + 0xdf, 0x98, 0x5f, + 0xbf, 0x87, 0x56, + 0x7f, 0x57, 0x26, + 0x5f, 0x39, 0xc, + 0x3f, 0x1c, 0x0, + 0x21, 0x0, 0x0, + 0x0, 0x43, 0x87, + 0x2d, 0x70, 0xaf, + 0x5a, 0x9e, 0xd7, + 0x87, 0xcc, 0xff, + 0xff, 0xe0, 0xba, + 0x21, 0x43, 0xf, + 0x3d, 0x5d, 0x25, + 0x59, 0x78, 0x3a, + 0x75, 0x93, 0x4f, + 0x91, 0xae, 0x64, + 0xad, 0xc8, 0x7a, + 0xf0, 0xa8, 0xef, + 0xd0, 0x88, 0xd0, + 0xaf, 0x66, 0xaf, + 0x8e, 0x44, 0x8e, + 0x6d, 0x22, 0x6d, + 0x4b, 0x0, 0x4b, + 0xff, 0xc0, 0xbc, + 0xff, 0x93, 0x91, + 0xff, 0x66, 0x67, + 0xd8, 0xf2, 0xbf, + 0xff, 0xc9, 0x68, + 0xff, 0x96, 0x67, + 0xa5, 0x60, 0xff, + 0x51, 0xff, 0x99, + 0x3f, 0xa5, 0x63, + 0x98, 0x90, 0x67 +}; + //----------------------------------------------------------------------------- // local functions //----------------------------------------------------------------------------- @@ -80,7 +142,7 @@ gint wxapp_idle_callback( gpointer WXUNUSED(data) ) wxApp::wxApp() { m_idleTag = 0; - m_topWindow = NULL; + m_topWindow = (wxWindow *) NULL; m_exitOnFrameDelete = TRUE; wxTheApp = this; } @@ -230,7 +292,7 @@ wxWindow *wxApp::GetTopWindow(void) { if (m_topWindow) return m_topWindow; wxNode *node = wxTopLevelWindows.First(); - if (!node) return NULL; + if (!node) return (wxWindow *) NULL; return (wxWindow*)node->Data(); } @@ -243,7 +305,7 @@ void wxApp::CommonInit(void) { /* -#if USE_RESOURCES +#if wxUSE_RESOURCES (void) wxGetResource("wxWindows", "OsVersion", &wxOsVersion); #endif */ @@ -261,26 +323,14 @@ void wxApp::CommonInit(void) wxInitializeResourceSystem(); - // For PostScript printing -#if USE_POSTSCRIPT - wxInitializePrintSetupData(); - wxThePrintPaperDatabase = new wxPrintPaperDatabase; - wxThePrintPaperDatabase->CreateDatabase(); -#endif - - -/* - wxBitmap::InitStandardHandlers(); - - g_globalCursor = new wxCursor; -*/ + wxImage::InitStandardHandlers(); + +// g_globalCursor = new wxCursor; } void wxApp::CommonCleanUp(void) { wxDELETE(wxTheColourDatabase); - wxDELETE(wxThePrintPaperDatabase); - wxDELETE(wxThePrintSetupData); wxDELETE(wxTheFontNameDirectory); wxDeleteStockObjects(); @@ -291,6 +341,8 @@ void wxApp::CommonCleanUp(void) wxDeleteStockLists(); wxCleanUpResourceSystem(); + + wxImage::CleanUpHandlers(); wxSystemSettings::Done(); } @@ -310,13 +362,9 @@ int wxEntry( int argc, char *argv[] ) wxClassInfo::InitializeClasses(); -#if (WXDEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT +#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT -#if !defined(_WINDLL) streambuf* sBuf = new wxDebugStreamBuf; -#else - streambuf* sBuf = NULL; -#endif ostream* oStr = new ostream(sBuf) ; wxDebugContext::SetStream(oStr, sBuf); @@ -326,7 +374,7 @@ int wxEntry( int argc, char *argv[] ) { if (!wxApp::GetInitializerFunction()) { - printf( _("wxWindows error: No initializer - use IMPLEMENT_APP macro.\n") ); + printf( "wxWindows error: No initializer - use IMPLEMENT_APP macro.\n" ); return 0; } @@ -339,24 +387,39 @@ int wxEntry( int argc, char *argv[] ) if (!wxTheApp) { - printf( _("wxWindows error: wxTheApp == NULL\n") ); + printf( "wxWindows error: wxTheApp == NULL\n" ); return 0; } wxTheApp->argc = argc; wxTheApp->argv = argv; + char name[200]; + strcpy( name, argv[0] ); + strcpy( name, wxFileNameFromPath(name) ); + wxStripExtension( name ); + wxTheApp->SetAppName( name ); + + gtk_set_locale(); + gtk_init( &argc, &argv ); -#ifdef USE_GDK_IMLIB - - gdk_imlib_init(); - - gtk_widget_push_visual(gdk_imlib_get_visual()); + GdkColormap *cmap = gdk_colormap_new( gdk_visual_get_system(), TRUE ); - gtk_widget_push_colormap(gdk_imlib_get_colormap()); - -#endif + for (int i = 0; i < 64; i++) + { + GdkColor col; + col.red = g_palette[i*3 + 0] << 8; + col.green = g_palette[i*3 + 1] << 8; + col.blue = g_palette[i*3 + 2] << 8; + col.pixel = 0; + + gdk_color_alloc( cmap, &col ); + } + + gtk_widget_push_colormap( cmap ); + + gtk_widget_set_default_colormap( cmap ); wxApp::CommonInit(); @@ -382,11 +445,15 @@ int wxEntry( int argc, char *argv[] ) wxDELETE(wxTheApp); -#if (WXDEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT - // At this point we want to check if there are any memory - // blocks that aren't part of the wxDebugContext itself, - // as a special case. Then when dumping we need to ignore - // wxDebugContext, too. + wxLog *oldLog = wxLog::SetActiveTarget( NULL ); + if (oldLog) delete oldLog; + + wxClassInfo::CleanUpClasses(); + + delete[] wxBuffer; + +#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT + if (wxDebugContext::CountObjectsLeft() > 0) { wxTrace("There were memory leaks.\n"); @@ -394,6 +461,7 @@ int wxEntry( int argc, char *argv[] ) wxDebugContext::PrintStatistics(); } wxDebugContext::SetStream(NULL, NULL); + #endif return retValue;