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

Made some treectrl sample icons transparent; added toolbar.h to wx.h

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4601 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1999-11-17 14:29:00 +00:00
parent b8ad9f18ca
commit 5f2936dacb
9 changed files with 33 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
distrib/msw/wisesys.txt
View File

@@ -1,21 +1,21 @@
item: Install File item: Install File
Source=c:\Windows\System\Msvcirt.dll Source=c:\Windows\System\Msvcirt.dll
Destination=%SYS32%\Msvcirt.dll Destination=%SYS32%\Msvcirt.dll
Flags=0000000000000010 Flags=0000010000010011
end end
item: Install File item: Install File
Source=c:\Windows\System\Msvcrt.dll Source=c:\Windows\System\Msvcrt.dll
Destination=%SYS32%\Msvcrt.dll Destination=%SYS32%\Msvcrt.dll
Flags=0000000000000010 Flags=0000010000010011
end end
item: Install File item: Install File
Source=c:\Windows\System\Msvcrt.dll Source=c:\Windows\System\Msvcrt.dll
Destination=%SYS%\Msvcrt.dll Destination=%SYS%\Msvcrt.dll
Flags=0000000000000010 Flags=0000010000010011
end end
item: Install File item: Install File
Source=c:\Windows\System\Msvcirt.dll Source=c:\Windows\System\Msvcirt.dll
Destination=%SYS%\Msvcirt.dll Destination=%SYS%\Msvcirt.dll
Flags=0000000000000010 Flags=0000010000010011
end end

32
docs/bugs.txt
View File

@@ -105,19 +105,27 @@ IDENTIFIED BY: A.T.Hofkamp
DATE FIXED: 11/11/1999 DATE FIXED: 11/11/1999
FIXED BY: Vaclav Slavik FIXED BY: Vaclav Slavik
BUG NUMBER: 6 BUG NUMBER: 6
SHORT DESCRIPTION: MSWindows Paths in include files SHORT DESCRIPTION: wxGTK-2.1.11 fails to build under IRIX
DETAILS: I may be wrong, but it looks like all the paths in the DETAILS: Seems we have a section that says, if we're not Sun, Linux, or
include files are based on a unix system. The problem is when FreeBSD, then there's something very wrong...
you go to compile VC++6 can't find any of the other includes it c++ -c -MMD -D__WXGTK__ -DGTK_NO_CHECK_CASTS -D_REENTRANT -D_IODBC_ -O2
needs. [Note from JACS: VC++ accepts forward slashes so -I. -I./include -I./include
there must be a setup problem.] -I./src/zlib -I./src/png -I./src/jpeg
WORKAROUND: Change all the paths in the includes -I/home/rhh/software/gtk+-1.2.3/include
-I/home/rhh/software/glib-1.2.3/lib/glib/include
-I/home/rhh/software/glib-1.2.3/include -Wall
-D"wxINSTALL_PREFIX=\"/home/rhh/software/wxGTK-2.1.11\"" -fPIC -o
dialup.o ./src/unix/dialup.cpp ./src/unix/dialup.cpp: In method `int
wxDialUpManagerImpl::CheckIfconfig()':
./src/unix/dialup.cpp:500: warning: ignoring pragma: warning
./src/unix/dialup.cpp:527: parse error before `;'
./src/unix/dialup.cpp:544: confused by earlier errors, bailing out gmake:
*** [dialup.o] Error 1
wxWINDOWS VERSION: 2.1.11 wxWINDOWS VERSION: 2.1.11
PLATFORMS: wxMSW PLATFORMS: wxGTK
DATE IDENTIFIED: 11/11/1999 DATE IDENTIFIED: 16/11/1999
IDENTIFIED BY: Mark A Russell <markarussell@earthlink.net> IDENTIFIED BY: Randall Hopper
---------------------------END OF BUGLIST------------------------- ---------------------------END OF BUGLIST-------------------------

1
include/wx/wx.h
View File

@@ -73,6 +73,7 @@
#include "wx/textdlg.h" #include "wx/textdlg.h"
#include "wx/filedlg.h" #include "wx/filedlg.h"
#include "wx/dirdlg.h" #include "wx/dirdlg.h"
#include "wx/toolbar.h"
#if wxUSE_VALIDATORS #if wxUSE_VALIDATORS
#include "wx/valtext.h" #include "wx/valtext.h"

BIN
samples/treectrl/bitmaps/folder1.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 318 B

After

Width:  |  Height:  |  Size: 318 B

BIN
samples/treectrl/bitmaps/folder2.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 318 B

After

Width:  |  Height:  |  Size: 318 B

BIN
samples/treectrl/bitmaps/folder3.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 318 B

After

Width:  |  Height:  |  Size: 318 B

4
src/wxvc.dsp
View File

@@ -996,10 +996,6 @@ SOURCE=.\msw\tbar95.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\msw\tbarmsw.cpp
# End Source File
# Begin Source File
SOURCE=.\msw\textctrl.cpp SOURCE=.\msw\textctrl.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File

4
src/wxvc_dll.dsp
View File

@@ -992,10 +992,6 @@ SOURCE=.\msw\tbar95.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\msw\tbarmsw.cpp
# End Source File
# Begin Source File
SOURCE=.\msw\textctrl.cpp SOURCE=.\msw\textctrl.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File

16
utils/projgen/makeproj.cpp
View File

@@ -655,8 +655,8 @@ bool wxProject::GenerateVCProject()
stream << "# ADD BASE BSC32 /nologo\n"; stream << "# ADD BASE BSC32 /nologo\n";
stream << "# ADD BSC32 /nologo\n"; stream << "# ADD BSC32 /nologo\n";
stream << "LINK32=link.exe\n"; stream << "LINK32=link.exe\n";
stream << "# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386\n"; stream << "# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /subsystem:windows /machine:I386\n";
stream << "# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wxvc.lib jpeg.lib "; stream << "# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib wxvc.lib jpeg.lib ";
n = m_extraLibs.Number(); n = m_extraLibs.Number();
for (i = 0; i < n; i++) for (i = 0; i < n; i++)
{ {
@@ -715,8 +715,8 @@ bool wxProject::GenerateVCProject()
stream << "# ADD BASE BSC32 /nologo\n"; stream << "# ADD BASE BSC32 /nologo\n";
stream << "# ADD BSC32 /nologo\n"; stream << "# ADD BSC32 /nologo\n";
stream << "LINK32=link.exe\n"; stream << "LINK32=link.exe\n";
stream << "# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept\n"; stream << "# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept\n";
stream << "# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wxvc.lib jpeg.lib "; stream << "# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib wxvc.lib jpeg.lib ";
n = m_extraLibs.Number(); n = m_extraLibs.Number();
for (i = 0; i < n; i++) for (i = 0; i < n; i++)
{ {
@@ -776,8 +776,8 @@ bool wxProject::GenerateVCProject()
stream << "# ADD BASE BSC32 /nologo\n"; stream << "# ADD BASE BSC32 /nologo\n";
stream << "# ADD BSC32 /nologo\n"; stream << "# ADD BSC32 /nologo\n";
stream << "LINK32=link.exe\n"; stream << "LINK32=link.exe\n";
stream << "# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept\n"; stream << "# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept\n";
stream << "# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wxvc.lib "; stream << "# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib wxvc.lib ";
n = m_extraLibs.Number(); n = m_extraLibs.Number();
for (i = 0; i < n; i++) for (i = 0; i < n; i++)
{ {
@@ -839,8 +839,8 @@ bool wxProject::GenerateVCProject()
stream << "# ADD BASE BSC32 /nologo\n"; stream << "# ADD BASE BSC32 /nologo\n";
stream << "# ADD BSC32 /nologo\n"; stream << "# ADD BSC32 /nologo\n";
stream << "LINK32=link.exe\n"; stream << "LINK32=link.exe\n";
stream << "# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386\n"; stream << "# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /subsystem:windows /machine:I386\n";
stream << "# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wxvc.lib "; stream << "# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib wxvc.lib ";
n = m_extraLibs.Number(); n = m_extraLibs.Number();
for (i = 0; i < n; i++) for (i = 0; i < n; i++)
{ {