From 5f2936dacb1a483e1407426bd5eca2b7b765a576 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Wed, 17 Nov 1999 14:29:00 +0000 Subject: [PATCH] Made some treectrl sample icons transparent; added toolbar.h to wx.h git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4601 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- distrib/msw/wisesys.txt | 8 +++---- docs/bugs.txt | 32 +++++++++++++++++---------- include/wx/wx.h | 1 + samples/treectrl/bitmaps/folder1.ico | Bin 318 -> 318 bytes samples/treectrl/bitmaps/folder2.ico | Bin 318 -> 318 bytes samples/treectrl/bitmaps/folder3.ico | Bin 318 -> 318 bytes src/wxvc.dsp | 4 ---- src/wxvc_dll.dsp | 4 ---- utils/projgen/makeproj.cpp | 16 +++++++------- 9 files changed, 33 insertions(+), 32 deletions(-) diff --git a/distrib/msw/wisesys.txt b/distrib/msw/wisesys.txt index 2f50610735..1f1b51be6e 100644 --- a/distrib/msw/wisesys.txt +++ b/distrib/msw/wisesys.txt @@ -1,21 +1,21 @@ item: Install File Source=c:\Windows\System\Msvcirt.dll Destination=%SYS32%\Msvcirt.dll - Flags=0000000000000010 + Flags=0000010000010011 end item: Install File Source=c:\Windows\System\Msvcrt.dll Destination=%SYS32%\Msvcrt.dll - Flags=0000000000000010 + Flags=0000010000010011 end item: Install File Source=c:\Windows\System\Msvcrt.dll Destination=%SYS%\Msvcrt.dll - Flags=0000000000000010 + Flags=0000010000010011 end item: Install File Source=c:\Windows\System\Msvcirt.dll Destination=%SYS%\Msvcirt.dll - Flags=0000000000000010 + Flags=0000010000010011 end diff --git a/docs/bugs.txt b/docs/bugs.txt index 8b51e314a3..1ffb7e1588 100644 --- a/docs/bugs.txt +++ b/docs/bugs.txt @@ -105,19 +105,27 @@ IDENTIFIED BY: A.T.Hofkamp DATE FIXED: 11/11/1999 FIXED BY: Vaclav Slavik -BUG NUMBER: 6 -SHORT DESCRIPTION: MSWindows Paths in include files -DETAILS: I may be wrong, but it looks like all the paths in the -include files are based on a unix system. The problem is when -you go to compile VC++6 can't find any of the other includes it -needs. [Note from JACS: VC++ accepts forward slashes so -there must be a setup problem.] -WORKAROUND: Change all the paths in the includes +BUG NUMBER: 6 +SHORT DESCRIPTION: wxGTK-2.1.11 fails to build under IRIX +DETAILS: Seems we have a section that says, if we're not Sun, Linux, or +FreeBSD, then there's something very wrong... +c++ -c -MMD -D__WXGTK__ -DGTK_NO_CHECK_CASTS -D_REENTRANT -D_IODBC_ -O2 +-I. -I./include -I./include +-I./src/zlib -I./src/png -I./src/jpeg +-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 -PLATFORMS: wxMSW -DATE IDENTIFIED: 11/11/1999 -IDENTIFIED BY: Mark A Russell - +PLATFORMS: wxGTK +DATE IDENTIFIED: 16/11/1999 +IDENTIFIED BY: Randall Hopper ---------------------------END OF BUGLIST------------------------- diff --git a/include/wx/wx.h b/include/wx/wx.h index ad7eeeaaca..ce3c1c2605 100644 --- a/include/wx/wx.h +++ b/include/wx/wx.h @@ -73,6 +73,7 @@ #include "wx/textdlg.h" #include "wx/filedlg.h" #include "wx/dirdlg.h" +#include "wx/toolbar.h" #if wxUSE_VALIDATORS #include "wx/valtext.h" diff --git a/samples/treectrl/bitmaps/folder1.ico b/samples/treectrl/bitmaps/folder1.ico index a84318433d48337a6ec69fd4b7eeb3a5b904fd8d..514257e7d593b75d94c14cba4b79fadf779b8703 100644 GIT binary patch literal 318 zcma)&p$@|^3`8$dL155u;r?-8hLQR~EzGCvFA55>cPSa@q@HtU$5w1BQo>3pGM-6# z*h6P#m^7hM480O6E=HUVB~)t-??N9(y*q-KQ?)lN;2+{|7maOGxnFh_zYD7 literal 318 zcmbVFISzm@409zO(21FmKX%DjiGk<9*k2Keq1f$$5Cg)Aol8l8K#MU#m;*2>lIl!k zz(55`(>F1I4znJpOi@Z<)Sxy;t;$H6TB@JmT=3jrekQ^E*o5zOziZB=J?FJ9DXr@9 K@cm`~_FpfKR&uof diff --git a/samples/treectrl/bitmaps/folder2.ico b/samples/treectrl/bitmaps/folder2.ico index ca50cdcdd75ecdd4f9b9c59ef3fca785b013f942..15f47103f538e96d2b68ea26429d26d78bea7614 100644 GIT binary patch delta 79 zcmdnTw2x_m7GuL?Mn=hrE>4^i7{GvY!o>b?#R=Wj)eQ^`oD(=YI)K8QGob*ar2ZcR Sg9A{PHjhIc149Ck2Lb?jlobO2 delta 65 zcmdnTw2x_m7UO}*f{ct@xR0u{55INy_RbG_JvP4p literal 318 zcmbu2u?>JQ3bJ7lt>J~Y8eTMGEGME2Ik*LG(g2C{)-)31`beX3zit diff --git a/src/wxvc.dsp b/src/wxvc.dsp index a22bfcbf6c..65c35a3200 100644 --- a/src/wxvc.dsp +++ b/src/wxvc.dsp @@ -996,10 +996,6 @@ SOURCE=.\msw\tbar95.cpp # End Source File # Begin Source File -SOURCE=.\msw\tbarmsw.cpp -# End Source File -# Begin Source File - SOURCE=.\msw\textctrl.cpp # End Source File # Begin Source File diff --git a/src/wxvc_dll.dsp b/src/wxvc_dll.dsp index b25b2551bb..cc4edd0404 100644 --- a/src/wxvc_dll.dsp +++ b/src/wxvc_dll.dsp @@ -992,10 +992,6 @@ SOURCE=.\msw\tbar95.cpp # End Source File # Begin Source File -SOURCE=.\msw\tbarmsw.cpp -# End Source File -# Begin Source File - SOURCE=.\msw\textctrl.cpp # End Source File # Begin Source File diff --git a/utils/projgen/makeproj.cpp b/utils/projgen/makeproj.cpp index e5380e9cd6..8f85989f9b 100644 --- a/utils/projgen/makeproj.cpp +++ b/utils/projgen/makeproj.cpp @@ -655,8 +655,8 @@ bool wxProject::GenerateVCProject() stream << "# ADD BASE BSC32 /nologo\n"; stream << "# ADD BSC32 /nologo\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 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 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 wsock32.lib wxvc.lib jpeg.lib "; n = m_extraLibs.Number(); for (i = 0; i < n; i++) { @@ -715,8 +715,8 @@ bool wxProject::GenerateVCProject() stream << "# ADD BASE BSC32 /nologo\n"; stream << "# ADD BSC32 /nologo\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 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 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 wsock32.lib wxvc.lib jpeg.lib "; n = m_extraLibs.Number(); for (i = 0; i < n; i++) { @@ -776,8 +776,8 @@ bool wxProject::GenerateVCProject() stream << "# ADD BASE BSC32 /nologo\n"; stream << "# ADD BSC32 /nologo\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 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 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 wsock32.lib wxvc.lib "; n = m_extraLibs.Number(); for (i = 0; i < n; i++) { @@ -839,8 +839,8 @@ bool wxProject::GenerateVCProject() stream << "# ADD BASE BSC32 /nologo\n"; stream << "# ADD BSC32 /nologo\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 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 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 wsock32.lib wxvc.lib "; n = m_extraLibs.Number(); for (i = 0; i < n; i++) { -- 2.45.2