Changed a few true -> TRUE

  added #ifdef GTK 1.2

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

diff --git a/docs/gtk/changes.txt b/docs/gtk/changes.txt
index d9ecabc642e516b78320a156272c208530180a87..03e7fa7bb14b8872c979fdff96fb3b5b9387594d 100644 (file)
--- a/docs/gtk/changes.txt
+++ b/docs/gtk/changes.txt
@@ -1,4 +1,23 @@
 
+25th June '99: Seventh wxGTK 2.1 snapshot released
+
+Many fixes to th new makefile system. The last version gave
+immediate crashes on all Unices except Linux when linked
+dynamically against an application. I reordered the object
+files in the library as I guess that this was the cause.
+
+Added icons to message box. This also slightly killed the
+layout so this needs to be changed again.
+
+wxGTK now chooses the best visual available on the display instead
+of the default one.
+
+Fixed wxProgressDialog again.
+
+Some more corrections I forgot.
+
+New wxPython (includes new layout system and printing).
+
 15th June '99: Sixth wxGTK 2.1 snapshot released
   
  

diff --git a/src/generic/printps.cpp b/src/generic/printps.cpp
index dcaf5394c51a0ff88ef85e66e3ff9c8c825c8da3..3317b1df0abc71ae91550e5b5a66c15f430c0a33 100644 (file)
--- a/src/generic/printps.cpp
+++ b/src/generic/printps.cpp
@@ -218,8 +218,8 @@ bool wxPostScriptPrinter::Print(wxWindow *parent, wxPrintout *printout, bool pro
                }
                else
                {
-                  sm_abortIt = true;
-                  keepGoing = false;
+                  sm_abortIt = TRUE;
+                  keepGoing = FALSE;
                }
             }
            wxYield();

diff --git a/src/generic/splitter.cpp b/src/generic/splitter.cpp
index c0228dd89045c7e68458c4d328c91bdd93f12de9..9e680e1748c4d0a3a1f98e6d858b05805655eaa6 100644 (file)
--- a/src/generic/splitter.cpp
+++ b/src/generic/splitter.cpp
@@ -363,7 +363,7 @@ void wxSplitterWindow::OnSize(wxSizeEvent& event)
         parent = parent->GetParent();
     }
 
-    bool iconized = false;
+    bool iconized = FALSE;
     wxFrame *frame = wxDynamicCast(parent, wxFrame);
     if ( frame )
         iconized = frame->IsIconized();

diff --git a/src/gtk/Makefile.am b/src/gtk/Makefile.am
index 801d06a57eaa49f43f402fd512b31009b6c29745..51c48c4cab30ecb0575e9a116a938eab2b42d871 100644 (file)
--- a/src/gtk/Makefile.am
+++ b/src/gtk/Makefile.am
@@ -4,8 +4,7 @@
 ##
 ## Process this file with automake to produce Makefile.in
 
-AUTOMAKE_OPTIONS = 1.3
-# no-dependencies
+AUTOMAKE_OPTIONS = 1.3 no-dependencies
 
 SUFFIXES = .cpp .c
 

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index cc096abe1d4662e3e1548490644821b780c28033..0aec5a8f56147920dd5fd134d8b40a2a16f322f8 100644 (file)
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -367,14 +367,17 @@ bool wxApp::OnInitGui()
                 }
                else
                {
+#if (GTK_MINOR_VERSION > 0)
                    /* assume 8-bit true or static colors. this really
                       exists. */
                    GdkVisual* vis = gdk_colormap_get_visual( cmap );
                    index = (r >> (5 - vis->red_prec)) << vis->red_shift;
                    index |= (g >> (5 - vis->green_prec)) << vis->green_shift;
                    index |= (b >> (5 - vis->blue_prec)) << vis->blue_shift;
+#else
+                    wxFAIL_MSG( _T("Unsupported graphics hardware") );
+#endif
                }
-               
                 m_colorCube[ (r*1024) + (g*32) + b ] = index;
             }
         }

diff --git a/src/gtk1/Makefile.am b/src/gtk1/Makefile.am
index 801d06a57eaa49f43f402fd512b31009b6c29745..51c48c4cab30ecb0575e9a116a938eab2b42d871 100644 (file)
--- a/src/gtk1/Makefile.am
+++ b/src/gtk1/Makefile.am
@@ -4,8 +4,7 @@
 ##
 ## Process this file with automake to produce Makefile.in
 
-AUTOMAKE_OPTIONS = 1.3
-# no-dependencies
+AUTOMAKE_OPTIONS = 1.3 no-dependencies
 
 SUFFIXES = .cpp .c
 

diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index cc096abe1d4662e3e1548490644821b780c28033..0aec5a8f56147920dd5fd134d8b40a2a16f322f8 100644 (file)
--- a/src/gtk1/app.cpp
+++ b/src/gtk1/app.cpp
@@ -367,14 +367,17 @@ bool wxApp::OnInitGui()
                 }
                else
                {
+#if (GTK_MINOR_VERSION > 0)
                    /* assume 8-bit true or static colors. this really
                       exists. */
                    GdkVisual* vis = gdk_colormap_get_visual( cmap );
                    index = (r >> (5 - vis->red_prec)) << vis->red_shift;
                    index |= (g >> (5 - vis->green_prec)) << vis->green_shift;
                    index |= (b >> (5 - vis->blue_prec)) << vis->blue_shift;
+#else
+                    wxFAIL_MSG( _T("Unsupported graphics hardware") );
+#endif
                }
-               
                 m_colorCube[ (r*1024) + (g*32) + b ] = index;
             }
         }