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

Removed wxXPMHandler

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10058 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2001-05-08 16:54:22 +00:00
parent 0eaa1d68c2
commit f50fd91940
9 changed files with 9 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
distrib/msw/tmake/filelist.txt
View File

@@ -319,7 +319,6 @@ utilsexc.cpp M B
uuid.cpp M O uuid.cpp M O
wave.cpp M wave.cpp M
window.cpp M window.cpp M
xpmhand.cpp M
dialup.cpp U dialup.cpp U
dir.cpp U B dir.cpp U B
@@ -759,7 +758,6 @@ wxchar.h W B
wxexpr.h W wxexpr.h W
wxhtml.h W wxhtml.h W
wxprec.h W B wxprec.h W B
xpmhand.h W
zipstrm.h W B zipstrm.h W B
zstream.h W B zstream.h W B
@@ -978,7 +976,6 @@ treectrl.h 9
wave.h 9 wave.h 9
window.h 9 window.h 9
winundef.h 9 winundef.h 9
xpmhand.h 9
# blank.cur 9 # blank.cur 9
# bullseye.cur 9 # bullseye.cur 9
# child.ico 9 # child.ico 9

4
src/msw/gdiimage.cpp
View File

@@ -42,7 +42,7 @@
#include "wx/msw/gdiimage.h" #include "wx/msw/gdiimage.h"
#include "wx/bitmap.h" #include "wx/bitmap.h"
#if wxUSE_XPM_IN_MSW #if 0 // wxUSE_XPM_IN_MSW
# include "wx/xpmhand.h" # include "wx/xpmhand.h"
#endif // wxUSE_XPM_IN_MSW #endif // wxUSE_XPM_IN_MSW
@@ -304,7 +304,7 @@ void wxGDIImage::InitStandardHandlers()
// GRG: Add these handlers by default if XPM support is enabled // GRG: Add these handlers by default if XPM support is enabled
#if wxUSE_XPM_IN_MSW #if 0 // wxUSE_XPM_IN_MSW
AddHandler(new wxXPMFileHandler); AddHandler(new wxXPMFileHandler);
AddHandler(new wxXPMDataHandler); AddHandler(new wxXPMDataHandler);
#endif // wxUSE_XPM_IN_MSW #endif // wxUSE_XPM_IN_MSW

3
src/msw/makefile.b32
View File

@@ -327,8 +327,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \
$(MSWDIR)\utilsexc.obj \ $(MSWDIR)\utilsexc.obj \
$(MSWDIR)\uuid.obj \ $(MSWDIR)\uuid.obj \
$(MSWDIR)\wave.obj \ $(MSWDIR)\wave.obj \
$(MSWDIR)\window.obj \ $(MSWDIR)\window.obj
$(MSWDIR)\xpmhand.obj
HTMLOBJS = $(MSWDIR)\helpctrl.obj \ HTMLOBJS = $(MSWDIR)\helpctrl.obj \
$(MSWDIR)\helpdata.obj \ $(MSWDIR)\helpdata.obj \

3
src/msw/makefile.bcc
View File

@@ -279,8 +279,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \
$(MSWDIR)\utils.obj \ $(MSWDIR)\utils.obj \
$(MSWDIR)\utilsexc.obj \ $(MSWDIR)\utilsexc.obj \
$(MSWDIR)\wave.obj \ $(MSWDIR)\wave.obj \
$(MSWDIR)\window.obj \ $(MSWDIR)\window.obj
$(MSWDIR)\xpmhand.obj
OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS)

3
src/msw/makefile.g95
View File

@@ -322,8 +322,7 @@ MSWOBJS = \
$(MSWDIR)/utils.$(OBJSUFF) \ $(MSWDIR)/utils.$(OBJSUFF) \
$(MSWDIR)/utilsexc.$(OBJSUFF) \ $(MSWDIR)/utilsexc.$(OBJSUFF) \
$(MSWDIR)/wave.$(OBJSUFF) \ $(MSWDIR)/wave.$(OBJSUFF) \
$(MSWDIR)/window.$(OBJSUFF) \ $(MSWDIR)/window.$(OBJSUFF)
$(MSWDIR)/xpmhand.$(OBJSUFF)
ADVANCEDOBJS = \ ADVANCEDOBJS = \
$(COMMDIR)/odbc.$(OBJSUFF) \ $(COMMDIR)/odbc.$(OBJSUFF) \

3
src/msw/makefile.vc
View File

@@ -343,8 +343,7 @@ MSWOBJS = ..\msw\$D\accel.obj \
..\msw\$D\utilsexc.obj \ ..\msw\$D\utilsexc.obj \
..\msw\ole\$D\uuid.obj \ ..\msw\ole\$D\uuid.obj \
..\msw\$D\wave.obj \ ..\msw\$D\wave.obj \
..\msw\$D\window.obj \ ..\msw\$D\window.obj
..\msw\$D\xpmhand.obj
HTMLOBJS = ..\html\$D\helpctrl.obj \ HTMLOBJS = ..\html\$D\helpctrl.obj \
..\html\$D\helpdata.obj \ ..\html\$D\helpdata.obj \

7
src/msw/makefile.wat
View File

@@ -305,8 +305,7 @@ MSWOBJS = accel.obj &
utilsexc.obj & utilsexc.obj &
uuid.obj & uuid.obj &
wave.obj & wave.obj &
window.obj & window.obj
xpmhand.obj
# Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc. # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS)
@@ -648,8 +647,8 @@ wave.obj: $(MSWDIR)\wave.cpp
window.obj: $(MSWDIR)\window.cpp window.obj: $(MSWDIR)\window.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $< *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
xpmhand.obj: $(MSWDIR)\xpmhand.cpp #xpmhand.obj: $(MSWDIR)\xpmhand.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $< # *$(CCC) $(CPPFLAGS) $(IFLAGS) $<

5
src/wxvc.dsp
View File

@@ -1141,11 +1141,6 @@ SOURCE=.\msw\wave.cpp
SOURCE=.\msw\window.cpp SOURCE=.\msw\window.cpp
# End Source File # End Source File
# Begin Source File
SOURCE=.\msw\xpmhand.cpp
# ADD CPP /I "../src/xpm"
# End Source File
# End Group # End Group
# Begin Group "OLE Files" # Begin Group "OLE Files"

5
src/wxvc_dll.dsp
View File

@@ -1139,11 +1139,6 @@ SOURCE=.\msw\wave.cpp
SOURCE=.\msw\window.cpp SOURCE=.\msw\window.cpp
# End Source File # End Source File
# Begin Source File
SOURCE=.\msw\xpmhand.cpp
# ADD CPP /I "../src/xpm"
# End Source File
# End Group # End Group
# Begin Group "OLE Files" # Begin Group "OLE Files"