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

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16702 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-08-23 11:57:10 +00:00
parent fde719f935
commit 1fc32b12ee
5 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
distrib/msw/innotop.txt
View File

@@ -30,7 +30,7 @@
AlwaysCreateUninstallIcon=1 AlwaysCreateUninstallIcon=1
UninstallIconName=Uninstall wxWindows 2.3.3 UninstallIconName=Uninstall wxWindows 2.3.3
Uninstallable=1 Uninstallable=1
DefaultDirName=c:\wxWindows-2.3.3 DefaultDirName=c:\wxWindows_2.3.3
DefaultGroupName=wxWindows 2.3.3 DefaultGroupName=wxWindows 2.3.3
LicenseFile=C:\wx2dev\wxWindows\docs\licence.txt LicenseFile=C:\wx2dev\wxWindows\docs\licence.txt
InfoBeforeFile=C:\wx2dev\wxWindows\docs\readme.txt InfoBeforeFile=C:\wx2dev\wxWindows\docs\readme.txt

9
src/generic/treectlg.cpp
View File

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

2
src/gtk/textctrl.cpp
View File

@@ -1300,7 +1300,7 @@ bool wxTextCtrl::SetBackgroundColour( const wxColour &colour )
if (m_windowStyle & wxTE_MULTILINE) if (m_windowStyle & wxTE_MULTILINE)
{ {
#ifndef __WXGTK__ #ifndef __WXGTK20__
GdkWindow *window = GTK_TEXT(m_text)->text_area; GdkWindow *window = GTK_TEXT(m_text)->text_area;
if (!window) if (!window)
return FALSE; return FALSE;

2
src/gtk1/textctrl.cpp
View File

@@ -1300,7 +1300,7 @@ bool wxTextCtrl::SetBackgroundColour( const wxColour &colour )
if (m_windowStyle & wxTE_MULTILINE) if (m_windowStyle & wxTE_MULTILINE)
{ {
#ifndef __WXGTK__ #ifndef __WXGTK20__
GdkWindow *window = GTK_TEXT(m_text)->text_area; GdkWindow *window = GTK_TEXT(m_text)->text_area;
if (!window) if (!window)
return FALSE; return FALSE;

1
wx-config.in
View File

@@ -32,6 +32,7 @@ cppflags()
{ {
if test "@includedir@" != "/usr/include" \ if test "@includedir@" != "/usr/include" \
-a "@includedir@" != "/usr/include/c++" \ -a "@includedir@" != "/usr/include/c++" \
-a "@includedir@" != "/usr/local/include" \
-a \( "${cross_compiling}" != "yes" \ -a \( "${cross_compiling}" != "yes" \
-o "@includedir@" != "/usr/${target}/include" \) ; -o "@includedir@" != "/usr/${target}/include" \) ;
then then