Distrib things.

  Readded resource support.

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

diff --git a/samples/forty/makefile.unx b/samples/forty/makefile.unx
index e3bf7df3e07f7d3fa585aa6d217f61fb71c3a8e5..0a689e8f1e27f4ac25c439fdcbb4c004de6d4c8c 100644 (file)
--- a/samples/forty/makefile.unx
+++ b/samples/forty/makefile.unx
@@ -13,9 +13,9 @@
 # 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
 

diff --git a/samples/grid/makefile.unx b/samples/grid/makefile.unx
index 3c5fee199ed08b734a466d4314c0f5068847b680..21cab3c677d139136e72901c8bdc808bb2a9b827 100644 (file)
--- a/samples/grid/makefile.unx
+++ b/samples/grid/makefile.unx
@@ -15,7 +15,7 @@
 
 CC = gcc
 
-PROGRAM = grid
+PROGRAM = test
 
 OBJECTS = $(PROGRAM).o
 

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index 7bc83fdbd7deb4b3816b14b56c81aeed255db09e..ba0fd8ed6b4f902579a1d912ad66df54f84d08c9 100644 (file)
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -476,17 +476,16 @@ bool wxApp::Initialize()
     wxPendingEventsLocker = new wxCriticalSection();
 #endif
 
-/*
-    wxTheFontNameDirectory =  new wxFontNameDirectory;
-    wxTheFontNameDirectory->Initialize();
-*/
-
     wxTheColourDatabase = new wxColourDatabase( wxKEY_STRING );
     wxTheColourDatabase->Initialize();
 
     wxInitializeStockLists();
     wxInitializeStockObjects();
 
+#if wxUSE_WX_RESOURCES
+    wxInitializeResourceSystem();
+#endif
+
     wxModule::RegisterModules();
     if (!wxModule::InitializeModules()) return FALSE;
 
@@ -497,15 +496,15 @@ void wxApp::CleanUp()
 {
     wxModule::CleanUpModules();
 
+#if wxUSE_WX_RESOURCES
+    wxCleanUpResourceSystem();
+#endif
+
     if (wxTheColourDatabase)
         delete wxTheColourDatabase;
+        
     wxTheColourDatabase = (wxColourDatabase*) NULL;
 
-/*
-    if (wxTheFontNameDirectory) delete wxTheFontNameDirectory;
-    wxTheFontNameDirectory = (wxFontNameDirectory*) NULL;
-*/
-
     wxDeleteStockObjects();
 
     wxDeleteStockLists();

diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index 7bc83fdbd7deb4b3816b14b56c81aeed255db09e..ba0fd8ed6b4f902579a1d912ad66df54f84d08c9 100644 (file)
--- a/src/gtk1/app.cpp
+++ b/src/gtk1/app.cpp
@@ -476,17 +476,16 @@ bool wxApp::Initialize()
     wxPendingEventsLocker = new wxCriticalSection();
 #endif
 
-/*
-    wxTheFontNameDirectory =  new wxFontNameDirectory;
-    wxTheFontNameDirectory->Initialize();
-*/
-
     wxTheColourDatabase = new wxColourDatabase( wxKEY_STRING );
     wxTheColourDatabase->Initialize();
 
     wxInitializeStockLists();
     wxInitializeStockObjects();
 
+#if wxUSE_WX_RESOURCES
+    wxInitializeResourceSystem();
+#endif
+
     wxModule::RegisterModules();
     if (!wxModule::InitializeModules()) return FALSE;
 
@@ -497,15 +496,15 @@ void wxApp::CleanUp()
 {
     wxModule::CleanUpModules();
 
+#if wxUSE_WX_RESOURCES
+    wxCleanUpResourceSystem();
+#endif
+
     if (wxTheColourDatabase)
         delete wxTheColourDatabase;
+        
     wxTheColourDatabase = (wxColourDatabase*) NULL;
 
-/*
-    if (wxTheFontNameDirectory) delete wxTheFontNameDirectory;
-    wxTheFontNameDirectory = (wxFontNameDirectory*) NULL;
-*/
-
     wxDeleteStockObjects();
 
     wxDeleteStockLists();