Replaced the old wxGetResource implementation with one based

in wxFileConfig.
  Compile fix for gsocket.c.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5037 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1999-12-20 17:15:32 +00:00
parent c7a9fa36e4
commit bd046d4221
7 changed files with 137 additions and 654 deletions

View File

@@ -47,15 +47,12 @@
wxApp *wxTheApp = (wxApp *) NULL;
wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL;
extern wxResourceCache *wxTheResourceCache;
extern bool g_isIdle;
//-----------------------------------------------------------------------------
// local functions
//-----------------------------------------------------------------------------
extern void wxFlushResources();
/* forward declaration */
gint wxapp_idle_callback( gpointer WXUNUSED(data) );
void wxapp_install_idle_handler();
@@ -498,12 +495,6 @@ bool wxApp::Initialize()
wxInitializeStockLists();
wxInitializeStockObjects();
#if wxUSE_WX_RESOURCES
wxTheResourceCache = new wxResourceCache( wxKEY_STRING );
wxInitializeResourceSystem();
#endif
wxModule::RegisterModules();
if (!wxModule::InitializeModules()) return FALSE;
@@ -514,16 +505,6 @@ void wxApp::CleanUp()
{
wxModule::CleanUpModules();
#if wxUSE_WX_RESOURCES
wxFlushResources();
if (wxTheResourceCache)
delete wxTheResourceCache;
wxTheResourceCache = (wxResourceCache*) NULL;
wxCleanUpResourceSystem();
#endif
if (wxTheColourDatabase)
delete wxTheColourDatabase;
wxTheColourDatabase = (wxColourDatabase*) NULL;