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

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

src/generic/treectlg.cpp

@@ -1496,9 +1496,13 @@ void wxGenericTreeCtrl::Expand(const wxTreeItemId& itemId)
 
 void wxGenericTreeCtrl::ExpandAll(const wxTreeItemId& item)
 {
-    Expand(item);
-    if ( IsExpanded(item) )
+    if ( !HasFlag(wxTR_HIDE_ROOT) || item != GetRootItem())
     {
+        Expand(item);
+        if ( !IsExpanded(item) )
+            return;
+    }
+    
     long cookie;
     wxTreeItemId child = GetFirstChild(item, cookie);
     while ( child.IsOk() )
@@ -1507,7 +1511,6 @@ void wxGenericTreeCtrl::ExpandAll(const wxTreeItemId& item)
         
         child = GetNextChild(item, cookie);
     }
-    }
 }
 
 void wxGenericTreeCtrl::Collapse(const wxTreeItemId& itemId)

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;

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;

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