Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Distrib things.

Browse Source 
Readded resource support.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5209 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2000-01-03 18:41:14 +00:00
parent 5747aa84c1
commit 4a0c68a70b
4 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
samples/forty/makefile.unx
View File

@@ -13,9 +13,9 @@
# under Linux. # under Linux.
# #
CC = gcc CC = g++
PROGRAM = drawing PROGRAM = forty
OBJECTS = $(PROGRAM).o canvas.o card.o game.o pile.o playerdg.o scoredg.o scorefil.o OBJECTS = $(PROGRAM).o canvas.o card.o game.o pile.o playerdg.o scoredg.o scorefil.o

2
samples/grid/makefile.unx
View File

@@ -15,7 +15,7 @@
CC = gcc CC = gcc
PROGRAM = grid PROGRAM = test
OBJECTS = $(PROGRAM).o OBJECTS = $(PROGRAM).o

19
src/gtk/app.cpp
View File

@@ -476,17 +476,16 @@ bool wxApp::Initialize()
wxPendingEventsLocker = new wxCriticalSection(); wxPendingEventsLocker = new wxCriticalSection();
#endif #endif
/*
wxTheFontNameDirectory = new wxFontNameDirectory;
wxTheFontNameDirectory->Initialize();
*/
wxTheColourDatabase = new wxColourDatabase( wxKEY_STRING ); wxTheColourDatabase = new wxColourDatabase( wxKEY_STRING );
wxTheColourDatabase->Initialize(); wxTheColourDatabase->Initialize();
wxInitializeStockLists(); wxInitializeStockLists();
wxInitializeStockObjects(); wxInitializeStockObjects();
#if wxUSE_WX_RESOURCES
wxInitializeResourceSystem();
#endif
wxModule::RegisterModules(); wxModule::RegisterModules();
if (!wxModule::InitializeModules()) return FALSE; if (!wxModule::InitializeModules()) return FALSE;
@@ -497,15 +496,15 @@ void wxApp::CleanUp()
{ {
wxModule::CleanUpModules(); wxModule::CleanUpModules();
#if wxUSE_WX_RESOURCES
wxCleanUpResourceSystem();
#endif
if (wxTheColourDatabase) if (wxTheColourDatabase)
delete wxTheColourDatabase; delete wxTheColourDatabase;
wxTheColourDatabase = (wxColourDatabase*) NULL; wxTheColourDatabase = (wxColourDatabase*) NULL;
/*
if (wxTheFontNameDirectory) delete wxTheFontNameDirectory;
wxTheFontNameDirectory = (wxFontNameDirectory*) NULL;
*/
wxDeleteStockObjects(); wxDeleteStockObjects();
wxDeleteStockLists(); wxDeleteStockLists();

19
src/gtk1/app.cpp
View File

@@ -476,17 +476,16 @@ bool wxApp::Initialize()
wxPendingEventsLocker = new wxCriticalSection(); wxPendingEventsLocker = new wxCriticalSection();
#endif #endif
/*
wxTheFontNameDirectory = new wxFontNameDirectory;
wxTheFontNameDirectory->Initialize();
*/
wxTheColourDatabase = new wxColourDatabase( wxKEY_STRING ); wxTheColourDatabase = new wxColourDatabase( wxKEY_STRING );
wxTheColourDatabase->Initialize(); wxTheColourDatabase->Initialize();
wxInitializeStockLists(); wxInitializeStockLists();
wxInitializeStockObjects(); wxInitializeStockObjects();
#if wxUSE_WX_RESOURCES
wxInitializeResourceSystem();
#endif
wxModule::RegisterModules(); wxModule::RegisterModules();
if (!wxModule::InitializeModules()) return FALSE; if (!wxModule::InitializeModules()) return FALSE;
@@ -497,15 +496,15 @@ void wxApp::CleanUp()
{ {
wxModule::CleanUpModules(); wxModule::CleanUpModules();
#if wxUSE_WX_RESOURCES
wxCleanUpResourceSystem();
#endif
if (wxTheColourDatabase) if (wxTheColourDatabase)
delete wxTheColourDatabase; delete wxTheColourDatabase;
wxTheColourDatabase = (wxColourDatabase*) NULL; wxTheColourDatabase = (wxColourDatabase*) NULL;
/*
if (wxTheFontNameDirectory) delete wxTheFontNameDirectory;
wxTheFontNameDirectory = (wxFontNameDirectory*) NULL;
*/
wxDeleteStockObjects(); wxDeleteStockObjects();
wxDeleteStockLists(); wxDeleteStockLists();