Added "set new icon" menu item to taskbar sample; updated some makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10046 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -68,15 +68,6 @@ src/msw/gsockmsw.c
|
|||||||
src/msw/ole/*.cpp
|
src/msw/ole/*.cpp
|
||||||
src/msw/*.prj
|
src/msw/*.prj
|
||||||
|
|
||||||
src/xpm/*.c
|
|
||||||
src/xpm/*.h
|
|
||||||
src/xpm/makefile*
|
|
||||||
src/xpm/changes
|
|
||||||
src/xpm/readme
|
|
||||||
src/xpm/readme.msw
|
|
||||||
src/xpm/copyrigh.t
|
|
||||||
src/xpm/files
|
|
||||||
|
|
||||||
include/wx/msw/*.h
|
include/wx/msw/*.h
|
||||||
include/wx/msw/*.rc
|
include/wx/msw/*.rc
|
||||||
include/wx/msw/ctl3d/*.h
|
include/wx/msw/ctl3d/*.h
|
||||||
|
@@ -155,7 +155,7 @@ HTMLOBJS = #$ ExpandList("WXHTMLOBJS");
|
|||||||
OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
|
OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
|
||||||
|
|
||||||
# Normal, static library
|
# Normal, static library
|
||||||
all: setuph dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib xpm jpeg tiff $(LIBTARGET)
|
all: setuph dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib jpeg tiff $(LIBTARGET)
|
||||||
|
|
||||||
setuph:
|
setuph:
|
||||||
cd $(WXDIR)\include\wx\msw
|
cd $(WXDIR)\include\wx\msw
|
||||||
@@ -247,7 +247,7 @@ $(WXDIR)\lib\$(WXLIBNAME).dll: $(DUMMYOBJ) $(OBJECTS)
|
|||||||
$(link) @<<
|
$(link) @<<
|
||||||
$(LINKFLAGS)
|
$(LINKFLAGS)
|
||||||
-out:$(WXDIR)\lib\$(WXLIBNAME).dll
|
-out:$(WXDIR)\lib\$(WXLIBNAME).dll
|
||||||
$(DUMMYOBJ) $(OBJECTS) $(guilibsdll) shell32.lib comctl32.lib ctl3d32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib odbc32.lib advapi32.lib winmm.lib $(GL_LIBS) $(WXDIR)\lib\png$(LIBEXT).lib $(WXDIR)\lib\zlib$(LIBEXT).lib $(WXDIR)\lib\xpm$(LIBEXT).lib $(WXDIR)\lib\jpeg$(LIBEXT).lib $(WXDIR)\lib\tiff$(LIBEXT).lib
|
$(DUMMYOBJ) $(OBJECTS) $(guilibsdll) shell32.lib comctl32.lib ctl3d32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib odbc32.lib advapi32.lib winmm.lib $(GL_LIBS) $(WXDIR)\lib\png$(LIBEXT).lib $(WXDIR)\lib\zlib$(LIBEXT).lib $(WXDIR)\lib\jpeg$(LIBEXT).lib $(WXDIR)\lib\tiff$(LIBEXT).lib
|
||||||
delayimp.lib
|
delayimp.lib
|
||||||
/delayload:ws2_32.dll /delayload:advapi32.dll /delayload:user32.dll /delayload:gdi32.dll
|
/delayload:ws2_32.dll /delayload:advapi32.dll /delayload:user32.dll /delayload:gdi32.dll
|
||||||
/delayload:comdlg32.dll /delayload:shell32.dll /delayload:comctl32.dll /delayload:ole32.dll
|
/delayload:comdlg32.dll /delayload:shell32.dll /delayload:comctl32.dll /delayload:ole32.dll
|
||||||
@@ -394,22 +394,12 @@ clean_tiff:
|
|||||||
nmake -f makefile.vc clean
|
nmake -f makefile.vc clean
|
||||||
cd $(WXDIR)\src\msw
|
cd $(WXDIR)\src\msw
|
||||||
|
|
||||||
xpm:
|
|
||||||
cd $(WXDIR)\src\xpm
|
|
||||||
nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG)
|
|
||||||
cd $(WXDIR)\src\msw
|
|
||||||
|
|
||||||
clean_xpm:
|
|
||||||
cd $(WXDIR)\src\xpm
|
|
||||||
nmake -f makefile.vc clean
|
|
||||||
cd $(WXDIR)\src\msw
|
|
||||||
|
|
||||||
rcparser:
|
rcparser:
|
||||||
cd $(WXDIR)\utils\rcparser\src
|
cd $(WXDIR)\utils\rcparser\src
|
||||||
nmake -f makefile.vc FINAL=$(FINAL)
|
nmake -f makefile.vc FINAL=$(FINAL)
|
||||||
cd $(WXDIR)\src\msw
|
cd $(WXDIR)\src\msw
|
||||||
|
|
||||||
cleanall: clean clean_png clean_zlib clean_xpm clean_jpeg clean_tiff
|
cleanall: clean clean_png clean_zlib clean_jpeg clean_tiff
|
||||||
-erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).dll
|
-erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).dll
|
||||||
-erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).lib
|
-erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).lib
|
||||||
-erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).exp
|
-erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).exp
|
||||||
@@ -446,9 +436,8 @@ clean: $(PERIPH_CLEAN_TARGET)
|
|||||||
-rmdir ..\common\$(D)
|
-rmdir ..\common\$(D)
|
||||||
-rmdir ..\html\$(D)
|
-rmdir ..\html\$(D)
|
||||||
|
|
||||||
|
|
||||||
# Making documents
|
# Making documents
|
||||||
docs: allhlp allhtml allpdfrtf htb htmlhelp
|
docs: allhlp allhtml allpdfrtf allhtb allhtmlhelp
|
||||||
alldocs: docs
|
alldocs: docs
|
||||||
hlp: wxhlp
|
hlp: wxhlp
|
||||||
wxhlp: $(DOCDIR)/winhelp/wx.hlp
|
wxhlp: $(DOCDIR)/winhelp/wx.hlp
|
||||||
@@ -467,21 +456,43 @@ referencps: $(WXDIR)\docs\ps\referenc.ps
|
|||||||
allhlp: wxhlp
|
allhlp: wxhlp
|
||||||
cd $(WXDIR)\utils\dialoged\src
|
cd $(WXDIR)\utils\dialoged\src
|
||||||
nmake -f makefile.vc hlp
|
nmake -f makefile.vc hlp
|
||||||
|
cd $(WXDIR)\utils\tex2rtf\src
|
||||||
|
nmake -f makefile.vc hlp
|
||||||
cd $(THISDIR)
|
cd $(THISDIR)
|
||||||
|
|
||||||
allhtml: wxhtml
|
allhtml: wxhtml
|
||||||
cd $(WXDIR)\utils\dialoged\src
|
cd $(WXDIR)\utils\dialoged\src
|
||||||
nmake -f makefile.vc html
|
nmake -f makefile.vc html
|
||||||
|
cd $(WXDIR)\utils\tex2rtf\src
|
||||||
|
nmake -f makefile.vc html
|
||||||
|
cd $(THISDIR)
|
||||||
|
|
||||||
|
allhtmlhelp: htmlhelp
|
||||||
|
cd $(WXDIR)\utils\dialoged\src
|
||||||
|
nmake -f makefile.vc htmlhelp
|
||||||
|
cd $(WXDIR)\utils\tex2rtf\src
|
||||||
|
nmake -f makefile.vc htmlhelp
|
||||||
|
cd $(THISDIR)
|
||||||
|
|
||||||
|
allhtb: htb
|
||||||
|
cd $(WXDIR)\utils\dialoged\src
|
||||||
|
nmake -f makefile.vc htb
|
||||||
|
cd $(WXDIR)\utils\tex2rtf\src
|
||||||
|
nmake -f makefile.vc htb
|
||||||
cd $(THISDIR)
|
cd $(THISDIR)
|
||||||
|
|
||||||
allps: wxps referencps
|
allps: wxps referencps
|
||||||
cd $(WXDIR)\utils\dialoged\src
|
cd $(WXDIR)\utils\dialoged\src
|
||||||
nmake -f makefile.vc ps
|
nmake -f makefile.vc ps
|
||||||
|
cd $(WXDIR)\utils\tex2rtf\src
|
||||||
|
nmake -f makefile.vc ps
|
||||||
cd $(THISDIR)
|
cd $(THISDIR)
|
||||||
|
|
||||||
allpdfrtf: pdfrtf
|
allpdfrtf: pdfrtf
|
||||||
cd $(WXDIR)\utils\dialoged\src
|
cd $(WXDIR)\utils\dialoged\src
|
||||||
nmake -f makefile.vc pdfrtf
|
nmake -f makefile.vc pdfrtf
|
||||||
|
cd $(WXDIR)\utils\tex2rtf\src
|
||||||
|
nmake -f makefile.vc pdfrtf
|
||||||
cd $(THISDIR)
|
cd $(THISDIR)
|
||||||
|
|
||||||
$(DOCDIR)/winhelp/wx.hlp: $(DOCDIR)/latex/wx/wx.rtf $(DOCDIR)/latex/wx/wx.hpj
|
$(DOCDIR)/winhelp/wx.hlp: $(DOCDIR)/latex/wx/wx.rtf $(DOCDIR)/latex/wx/wx.hpj
|
||||||
|
@@ -31,12 +31,11 @@ wxWindows 2 currently supports the following platforms:
|
|||||||
- Windows 3.1, Windows 95/98, Windows NT
|
- Windows 3.1, Windows 95/98, Windows NT
|
||||||
- Most Unix variants with Motif/Lesstif
|
- Most Unix variants with Motif/Lesstif
|
||||||
- Most Unix variants with GTK+
|
- Most Unix variants with GTK+
|
||||||
- Mac (not covered here: please see the wxWindows web site
|
- MacOS
|
||||||
for details)
|
|
||||||
|
|
||||||
Most popular C++ compilers are supported; see the install.txt
|
Most popular C++ compilers are supported; see the install.txt
|
||||||
file for each platform (available via docs/html/index.htm) for details.
|
file for each platform (available via docs/html/index.htm) for details.
|
||||||
See also http://www.lpthe.jussieu.fr/~zeitlin/wxWindows/platform.html.
|
See also http://www.wxwindows.org/platform.htm.
|
||||||
|
|
||||||
Files
|
Files
|
||||||
-----
|
-----
|
||||||
@@ -77,6 +76,12 @@ wxMSW-x.y.z.zip Zip archive containing all the
|
|||||||
files that are in the setup
|
files that are in the setup
|
||||||
distribution
|
distribution
|
||||||
|
|
||||||
|
wxWindows for MacOS distribution
|
||||||
|
--------------------------------
|
||||||
|
|
||||||
|
wxMac-x.y.z.zip Zip archive containing all
|
||||||
|
source files (excludes documentation)
|
||||||
|
|
||||||
As well as the core source, the wxMSW distribution contains:
|
As well as the core source, the wxMSW distribution contains:
|
||||||
|
|
||||||
- Windows HTML Help versions of the documentation (docs/htmlhelp);
|
- Windows HTML Help versions of the documentation (docs/htmlhelp);
|
||||||
@@ -129,6 +134,7 @@ in the individual directories:
|
|||||||
docs/msw
|
docs/msw
|
||||||
docs/gtk
|
docs/gtk
|
||||||
docs/motif
|
docs/motif
|
||||||
|
docs/mac
|
||||||
|
|
||||||
Licence information
|
Licence information
|
||||||
-------------------
|
-------------------
|
||||||
@@ -201,10 +207,10 @@ The main wxWindows ftp site is at:
|
|||||||
|
|
||||||
A wxWindows CD-ROM with the latest distribution plus an HTML
|
A wxWindows CD-ROM with the latest distribution plus an HTML
|
||||||
front-end and hundreds of MB of compilers, utilities and other
|
front-end and hundreds of MB of compilers, utilities and other
|
||||||
material may be ordered from the CD-ROM page (see the wxWindows
|
material may be ordered from the CD-ROM page: see the wxWindows
|
||||||
web site) or contact Julian Smart <julian.smart@ukonline.co.uk>.
|
web site.
|
||||||
|
|
||||||
Good luck!
|
Good luck!
|
||||||
|
|
||||||
The wxWindows Team, 9th July, 2000
|
The wxWindows Team, 8th May, 2001
|
||||||
|
|
||||||
|
@@ -30,13 +30,13 @@ IMPLEMENT_APP(MyApp)
|
|||||||
|
|
||||||
bool MyApp::OnInit(void)
|
bool MyApp::OnInit(void)
|
||||||
{
|
{
|
||||||
wxIcon icon("mondrian_icon");
|
wxIcon icon(wxT("mondrian_icon"));
|
||||||
|
|
||||||
if (!m_taskBarIcon.SetIcon(icon, "wxTaskBarIcon Sample"))
|
if (!m_taskBarIcon.SetIcon(icon, wxT("wxTaskBarIcon Sample")))
|
||||||
wxMessageBox("Could not set icon.");
|
wxMessageBox(wxT("Could not set icon."));
|
||||||
|
|
||||||
// Create the main frame window
|
// Create the main frame window
|
||||||
dialog = new MyDialog(NULL, -1, "wxTaskBarIcon Test Dialog", wxPoint(-1, -1), wxSize(365, 290), wxDIALOG_MODELESS|wxDEFAULT_DIALOG_STYLE);
|
dialog = new MyDialog(NULL, -1, wxT("wxTaskBarIcon Test Dialog"), wxPoint(-1, -1), wxSize(365, 290), wxDIALOG_MODELESS|wxDEFAULT_DIALOG_STYLE);
|
||||||
|
|
||||||
dialog->Show(TRUE);
|
dialog->Show(TRUE);
|
||||||
|
|
||||||
@@ -94,6 +94,7 @@ void MyDialog::Init(void)
|
|||||||
|
|
||||||
enum {
|
enum {
|
||||||
PU_RESTORE = 10001,
|
PU_RESTORE = 10001,
|
||||||
|
PU_NEW_ICON,
|
||||||
PU_EXIT,
|
PU_EXIT,
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -101,6 +102,7 @@ enum {
|
|||||||
BEGIN_EVENT_TABLE(MyTaskBarIcon, wxTaskBarIcon)
|
BEGIN_EVENT_TABLE(MyTaskBarIcon, wxTaskBarIcon)
|
||||||
EVT_MENU(PU_RESTORE, MyTaskBarIcon::OnMenuRestore)
|
EVT_MENU(PU_RESTORE, MyTaskBarIcon::OnMenuRestore)
|
||||||
EVT_MENU(PU_EXIT, MyTaskBarIcon::OnMenuExit)
|
EVT_MENU(PU_EXIT, MyTaskBarIcon::OnMenuExit)
|
||||||
|
EVT_MENU(PU_NEW_ICON,MyTaskBarIcon::OnMenuSetNewIcon)
|
||||||
END_EVENT_TABLE()
|
END_EVENT_TABLE()
|
||||||
|
|
||||||
void MyTaskBarIcon::OnMenuRestore(wxCommandEvent& )
|
void MyTaskBarIcon::OnMenuRestore(wxCommandEvent& )
|
||||||
@@ -118,6 +120,15 @@ void MyTaskBarIcon::OnMenuExit(wxCommandEvent& )
|
|||||||
wxGetApp().ProcessIdle();
|
wxGetApp().ProcessIdle();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void MyTaskBarIcon::OnMenuSetNewIcon(wxCommandEvent&)
|
||||||
|
{
|
||||||
|
#ifdef __WXMSW__
|
||||||
|
wxIcon icon(wxT("wxDEFAULT_FRAME"));
|
||||||
|
|
||||||
|
if (!SetIcon(icon, wxT("wxTaskBarIcon Sample")))
|
||||||
|
wxMessageBox(wxT("Could not set new icon."));
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
// Overridables
|
// Overridables
|
||||||
void MyTaskBarIcon::OnMouseMove(wxEvent&)
|
void MyTaskBarIcon::OnMouseMove(wxEvent&)
|
||||||
@@ -141,6 +152,9 @@ void MyTaskBarIcon::OnRButtonUp(wxEvent&)
|
|||||||
wxMenu menu;
|
wxMenu menu;
|
||||||
|
|
||||||
menu.Append(PU_RESTORE, "&Restore TBTest");
|
menu.Append(PU_RESTORE, "&Restore TBTest");
|
||||||
|
#ifdef __WXMSW__
|
||||||
|
menu.Append(PU_NEW_ICON,"&Set New Icon");
|
||||||
|
#endif
|
||||||
menu.Append(PU_EXIT, "E&xit");
|
menu.Append(PU_EXIT, "E&xit");
|
||||||
|
|
||||||
PopupMenu(&menu);
|
PopupMenu(&menu);
|
||||||
|
@@ -24,6 +24,7 @@ public:
|
|||||||
|
|
||||||
void OnMenuRestore(wxCommandEvent&);
|
void OnMenuRestore(wxCommandEvent&);
|
||||||
void OnMenuExit(wxCommandEvent&);
|
void OnMenuExit(wxCommandEvent&);
|
||||||
|
void OnMenuSetNewIcon(wxCommandEvent&);
|
||||||
|
|
||||||
DECLARE_EVENT_TABLE()
|
DECLARE_EVENT_TABLE()
|
||||||
};
|
};
|
||||||
|
@@ -1,3 +1,4 @@
|
|||||||
mondrian_icon ICON "mondrian.ico"
|
mondrian_icon ICON "mondrian.ico"
|
||||||
|
wxDEFAULT_FRAME ICON "wx/msw/std.ico"
|
||||||
#include "wx/msw/wx.rc"
|
#include "wx/msw/wx.rc"
|
||||||
|
|
||||||
|
@@ -373,7 +373,7 @@ HTMLOBJS = ..\html\$D\helpctrl.obj \
|
|||||||
OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
|
OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
|
||||||
|
|
||||||
# Normal, static library
|
# Normal, static library
|
||||||
all: setuph dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib xpm jpeg tiff $(LIBTARGET)
|
all: setuph dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib jpeg tiff $(LIBTARGET)
|
||||||
|
|
||||||
setuph:
|
setuph:
|
||||||
cd $(WXDIR)\include\wx\msw
|
cd $(WXDIR)\include\wx\msw
|
||||||
@@ -465,7 +465,7 @@ $(WXDIR)\lib\$(WXLIBNAME).dll: $(DUMMYOBJ) $(OBJECTS)
|
|||||||
$(link) @<<
|
$(link) @<<
|
||||||
$(LINKFLAGS)
|
$(LINKFLAGS)
|
||||||
-out:$(WXDIR)\lib\$(WXLIBNAME).dll
|
-out:$(WXDIR)\lib\$(WXLIBNAME).dll
|
||||||
$(DUMMYOBJ) $(OBJECTS) $(guilibsdll) shell32.lib comctl32.lib ctl3d32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib odbc32.lib advapi32.lib winmm.lib $(GL_LIBS) $(WXDIR)\lib\png$(LIBEXT).lib $(WXDIR)\lib\zlib$(LIBEXT).lib $(WXDIR)\lib\xpm$(LIBEXT).lib $(WXDIR)\lib\jpeg$(LIBEXT).lib $(WXDIR)\lib\tiff$(LIBEXT).lib
|
$(DUMMYOBJ) $(OBJECTS) $(guilibsdll) shell32.lib comctl32.lib ctl3d32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib odbc32.lib advapi32.lib winmm.lib $(GL_LIBS) $(WXDIR)\lib\png$(LIBEXT).lib $(WXDIR)\lib\zlib$(LIBEXT).lib $(WXDIR)\lib\jpeg$(LIBEXT).lib $(WXDIR)\lib\tiff$(LIBEXT).lib
|
||||||
delayimp.lib
|
delayimp.lib
|
||||||
/delayload:ws2_32.dll /delayload:advapi32.dll /delayload:user32.dll /delayload:gdi32.dll
|
/delayload:ws2_32.dll /delayload:advapi32.dll /delayload:user32.dll /delayload:gdi32.dll
|
||||||
/delayload:comdlg32.dll /delayload:shell32.dll /delayload:comctl32.dll /delayload:ole32.dll
|
/delayload:comdlg32.dll /delayload:shell32.dll /delayload:comctl32.dll /delayload:ole32.dll
|
||||||
@@ -612,22 +612,12 @@ clean_tiff:
|
|||||||
nmake -f makefile.vc clean
|
nmake -f makefile.vc clean
|
||||||
cd $(WXDIR)\src\msw
|
cd $(WXDIR)\src\msw
|
||||||
|
|
||||||
xpm:
|
|
||||||
cd $(WXDIR)\src\xpm
|
|
||||||
nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG)
|
|
||||||
cd $(WXDIR)\src\msw
|
|
||||||
|
|
||||||
clean_xpm:
|
|
||||||
cd $(WXDIR)\src\xpm
|
|
||||||
nmake -f makefile.vc clean
|
|
||||||
cd $(WXDIR)\src\msw
|
|
||||||
|
|
||||||
rcparser:
|
rcparser:
|
||||||
cd $(WXDIR)\utils\rcparser\src
|
cd $(WXDIR)\utils\rcparser\src
|
||||||
nmake -f makefile.vc FINAL=$(FINAL)
|
nmake -f makefile.vc FINAL=$(FINAL)
|
||||||
cd $(WXDIR)\src\msw
|
cd $(WXDIR)\src\msw
|
||||||
|
|
||||||
cleanall: clean clean_png clean_zlib clean_xpm clean_jpeg clean_tiff
|
cleanall: clean clean_png clean_zlib clean_jpeg clean_tiff
|
||||||
-erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).dll
|
-erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).dll
|
||||||
-erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).lib
|
-erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).lib
|
||||||
-erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).exp
|
-erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).exp
|
||||||
@@ -666,7 +656,7 @@ clean: $(PERIPH_CLEAN_TARGET)
|
|||||||
|
|
||||||
|
|
||||||
# Making documents
|
# Making documents
|
||||||
docs: allhlp allhtml allpdfrtf htb htmlhelp
|
docs: allhlp allhtml allpdfrtf allhtb allhtmlhelp
|
||||||
alldocs: docs
|
alldocs: docs
|
||||||
hlp: wxhlp
|
hlp: wxhlp
|
||||||
wxhlp: $(DOCDIR)/winhelp/wx.hlp
|
wxhlp: $(DOCDIR)/winhelp/wx.hlp
|
||||||
@@ -685,21 +675,43 @@ referencps: $(WXDIR)\docs\ps\referenc.ps
|
|||||||
allhlp: wxhlp
|
allhlp: wxhlp
|
||||||
cd $(WXDIR)\utils\dialoged\src
|
cd $(WXDIR)\utils\dialoged\src
|
||||||
nmake -f makefile.vc hlp
|
nmake -f makefile.vc hlp
|
||||||
|
cd $(WXDIR)\utils\tex2rtf\src
|
||||||
|
nmake -f makefile.vc hlp
|
||||||
cd $(THISDIR)
|
cd $(THISDIR)
|
||||||
|
|
||||||
allhtml: wxhtml
|
allhtml: wxhtml
|
||||||
cd $(WXDIR)\utils\dialoged\src
|
cd $(WXDIR)\utils\dialoged\src
|
||||||
nmake -f makefile.vc html
|
nmake -f makefile.vc html
|
||||||
|
cd $(WXDIR)\utils\tex2rtf\src
|
||||||
|
nmake -f makefile.vc html
|
||||||
|
cd $(THISDIR)
|
||||||
|
|
||||||
|
allhtmlhelp: htmlhelp
|
||||||
|
cd $(WXDIR)\utils\dialoged\src
|
||||||
|
nmake -f makefile.vc htmlhelp
|
||||||
|
cd $(WXDIR)\utils\tex2rtf\src
|
||||||
|
nmake -f makefile.vc htmlhelp
|
||||||
|
cd $(THISDIR)
|
||||||
|
|
||||||
|
allhtb: htb
|
||||||
|
cd $(WXDIR)\utils\dialoged\src
|
||||||
|
nmake -f makefile.vc htb
|
||||||
|
cd $(WXDIR)\utils\tex2rtf\src
|
||||||
|
nmake -f makefile.vc htb
|
||||||
cd $(THISDIR)
|
cd $(THISDIR)
|
||||||
|
|
||||||
allps: wxps referencps
|
allps: wxps referencps
|
||||||
cd $(WXDIR)\utils\dialoged\src
|
cd $(WXDIR)\utils\dialoged\src
|
||||||
nmake -f makefile.vc ps
|
nmake -f makefile.vc ps
|
||||||
|
cd $(WXDIR)\utils\tex2rtf\src
|
||||||
|
nmake -f makefile.vc ps
|
||||||
cd $(THISDIR)
|
cd $(THISDIR)
|
||||||
|
|
||||||
allpdfrtf: pdfrtf
|
allpdfrtf: pdfrtf
|
||||||
cd $(WXDIR)\utils\dialoged\src
|
cd $(WXDIR)\utils\dialoged\src
|
||||||
nmake -f makefile.vc pdfrtf
|
nmake -f makefile.vc pdfrtf
|
||||||
|
cd $(WXDIR)\utils\tex2rtf\src
|
||||||
|
nmake -f makefile.vc pdfrtf
|
||||||
cd $(THISDIR)
|
cd $(THISDIR)
|
||||||
|
|
||||||
$(DOCDIR)/winhelp/wx.hlp: $(DOCDIR)/latex/wx/wx.rtf $(DOCDIR)/latex/wx/wx.hpj
|
$(DOCDIR)/winhelp/wx.hlp: $(DOCDIR)/latex/wx/wx.rtf $(DOCDIR)/latex/wx/wx.hpj
|
||||||
|
15
src/wxvc.dsw
15
src/wxvc.dsw
@@ -51,9 +51,6 @@ Package=<4>
|
|||||||
Project_Dep_Name zlib
|
Project_Dep_Name zlib
|
||||||
End Project Dependency
|
End Project Dependency
|
||||||
Begin Project Dependency
|
Begin Project Dependency
|
||||||
Project_Dep_Name xpm
|
|
||||||
End Project Dependency
|
|
||||||
Begin Project Dependency
|
|
||||||
Project_Dep_Name png
|
Project_Dep_Name png
|
||||||
End Project Dependency
|
End Project Dependency
|
||||||
Begin Project Dependency
|
Begin Project Dependency
|
||||||
@@ -66,18 +63,6 @@ Package=<4>
|
|||||||
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
|
|
||||||
Project: "xpm"=.\xpm\XpmVC.dsp - Package Owner=<4>
|
|
||||||
|
|
||||||
Package=<5>
|
|
||||||
{{{
|
|
||||||
}}}
|
|
||||||
|
|
||||||
Package=<4>
|
|
||||||
{{{
|
|
||||||
}}}
|
|
||||||
|
|
||||||
###############################################################################
|
|
||||||
|
|
||||||
Project: "zlib"=.\zlib\ZlibVC.dsp - Package Owner=<4>
|
Project: "zlib"=.\zlib\ZlibVC.dsp - Package Owner=<4>
|
||||||
|
|
||||||
Package=<5>
|
Package=<5>
|
||||||
|
107
src/wxvc_dll.dsp
107
src/wxvc_dll.dsp
@@ -256,10 +256,6 @@ SOURCE=.\common\gifdecod.cpp
|
|||||||
# End Source File
|
# End Source File
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
|
|
||||||
SOURCE=.\common\xpmdecod.cpp
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\common\hash.cpp
|
SOURCE=.\common\hash.cpp
|
||||||
# End Source File
|
# End Source File
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
@@ -521,6 +517,10 @@ SOURCE=.\common\wxexpr.cpp
|
|||||||
# End Source File
|
# End Source File
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=.\common\xpmdecod.cpp
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
SOURCE=.\common\zipstrm.cpp
|
SOURCE=.\common\zipstrm.cpp
|
||||||
# ADD CPP /I "zlib"
|
# ADD CPP /I "zlib"
|
||||||
# End Source File
|
# End Source File
|
||||||
@@ -1273,105 +1273,6 @@ SOURCE=.\png\pngwutil.c
|
|||||||
# SUBTRACT CPP /YX /Yc /Yu
|
# SUBTRACT CPP /YX /Yc /Yu
|
||||||
# End Source File
|
# End Source File
|
||||||
# End Group
|
# End Group
|
||||||
# Begin Group "XPM Files"
|
|
||||||
|
|
||||||
# PROP Default_Filter ""
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\xpm\attrib.c
|
|
||||||
# SUBTRACT CPP /YX /Yc /Yu
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\xpm\crbuffri.c
|
|
||||||
# SUBTRACT CPP /YX /Yc /Yu
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\xpm\crdatfri.c
|
|
||||||
# SUBTRACT CPP /YX /Yc /Yu
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\xpm\create.c
|
|
||||||
# SUBTRACT CPP /YX /Yc /Yu
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\xpm\crifrbuf.c
|
|
||||||
# SUBTRACT CPP /YX /Yc /Yu
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\xpm\crifrdat.c
|
|
||||||
# SUBTRACT CPP /YX /Yc /Yu
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\xpm\dataxpm.c
|
|
||||||
# SUBTRACT CPP /YX /Yc /Yu
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\xpm\hashtab.c
|
|
||||||
# SUBTRACT CPP /YX /Yc /Yu
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\xpm\imagexpm.c
|
|
||||||
# SUBTRACT CPP /YX /Yc /Yu
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\xpm\info.c
|
|
||||||
# SUBTRACT CPP /YX /Yc /Yu
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\xpm\misc.c
|
|
||||||
# SUBTRACT CPP /YX /Yc /Yu
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\xpm\parse.c
|
|
||||||
# SUBTRACT CPP /YX /Yc /Yu
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\xpm\rdftodat.c
|
|
||||||
# SUBTRACT CPP /YX /Yc /Yu
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\xpm\rdftoi.c
|
|
||||||
# SUBTRACT CPP /YX /Yc /Yu
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\xpm\rgb.c
|
|
||||||
# SUBTRACT CPP /YX /Yc /Yu
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\xpm\scan.c
|
|
||||||
# SUBTRACT CPP /YX /Yc /Yu
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\xpm\simx.c
|
|
||||||
# SUBTRACT CPP /YX /Yc /Yu
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\xpm\wrffrdat.c
|
|
||||||
# SUBTRACT CPP /YX /Yc /Yu
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\xpm\wrffri.c
|
|
||||||
# SUBTRACT CPP /YX /Yc /Yu
|
|
||||||
# End Source File
|
|
||||||
# End Group
|
|
||||||
# Begin Group "Zlib Files"
|
# Begin Group "Zlib Files"
|
||||||
|
|
||||||
# PROP Default_Filter ""
|
# PROP Default_Filter ""
|
||||||
|
Reference in New Issue
Block a user