From: Julian Smart <julian@anthemion.co.uk>
Date: Fri, 23 Aug 2002 11:57:10 +0000 (+0000)
Subject: Misc mods for feedback from Marcin Wojdyr <wojdyr@if.pw.edu.pl>
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/1fc32b12ee7bf089b8d8403b2f13232ea50c822c

Misc mods for feedback from Marcin Wojdyr <wojdyr@if.pw.edu.pl>


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

diff --git a/distrib/msw/innotop.txt b/distrib/msw/innotop.txt
index 790915d40b..7e5c76ba20 100644
--- a/distrib/msw/innotop.txt
+++ b/distrib/msw/innotop.txt
@@ -30,7 +30,7 @@
     AlwaysCreateUninstallIcon=1
     UninstallIconName=Uninstall wxWindows 2.3.3
     Uninstallable=1
-    DefaultDirName=c:\wxWindows-2.3.3
+    DefaultDirName=c:\wxWindows_2.3.3
     DefaultGroupName=wxWindows 2.3.3
     LicenseFile=C:\wx2dev\wxWindows\docs\licence.txt
     InfoBeforeFile=C:\wx2dev\wxWindows\docs\readme.txt
diff --git a/src/generic/treectlg.cpp b/src/generic/treectlg.cpp
index c7732185bc..4d572e4b92 100644
--- a/src/generic/treectlg.cpp
+++ b/src/generic/treectlg.cpp
@@ -1496,17 +1496,20 @@ void wxGenericTreeCtrl::Expand(const wxTreeItemId& itemId)
 
 void wxGenericTreeCtrl::ExpandAll(const wxTreeItemId& item)
 {
-    Expand(item);
-    if ( IsExpanded(item) )
+    if ( !HasFlag(wxTR_HIDE_ROOT) || item != GetRootItem())
     {
-        long cookie;
-        wxTreeItemId child = GetFirstChild(item, cookie);
-        while ( child.IsOk() )
-        {
-            ExpandAll(child);
-
-            child = GetNextChild(item, cookie);
-        }
+        Expand(item);
+        if ( !IsExpanded(item) )
+            return;
+    }
+    
+    long cookie;
+    wxTreeItemId child = GetFirstChild(item, cookie);
+    while ( child.IsOk() )
+    {
+        ExpandAll(child);
+        
+        child = GetNextChild(item, cookie);
     }
 }
 
diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index abfebd1375..054f16b48d 100644
--- a/src/gtk/textctrl.cpp
+++ b/src/gtk/textctrl.cpp
@@ -1300,7 +1300,7 @@ bool wxTextCtrl::SetBackgroundColour( const wxColour &colour )
 
     if (m_windowStyle & wxTE_MULTILINE)
     {
-#ifndef __WXGTK__
+#ifndef __WXGTK20__
         GdkWindow *window = GTK_TEXT(m_text)->text_area;
         if (!window)
             return FALSE;
diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp
index abfebd1375..054f16b48d 100644
--- a/src/gtk1/textctrl.cpp
+++ b/src/gtk1/textctrl.cpp
@@ -1300,7 +1300,7 @@ bool wxTextCtrl::SetBackgroundColour( const wxColour &colour )
 
     if (m_windowStyle & wxTE_MULTILINE)
     {
-#ifndef __WXGTK__
+#ifndef __WXGTK20__
         GdkWindow *window = GTK_TEXT(m_text)->text_area;
         if (!window)
             return FALSE;
diff --git a/wx-config.in b/wx-config.in
index 7ce8e5c361..2a1a40ef68 100755
--- a/wx-config.in
+++ b/wx-config.in
@@ -32,6 +32,7 @@ cppflags()
 {
     if test "@includedir@" != "/usr/include" \
             -a "@includedir@" != "/usr/include/c++" \
+            -a "@includedir@" != "/usr/local/include" \
             -a \( "${cross_compiling}" != "yes" \
                   -o "@includedir@" != "/usr/${target}/include" \) ;
     then