Removed wxXPMHandler

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10058 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt
index 88958d7bea6b9ffe7ee439876a1525a85d42e1d3..cfae1c50947a5bf4432451907efa92f3fd964b67 100644 (file)
--- a/distrib/msw/tmake/filelist.txt
+++ b/distrib/msw/tmake/filelist.txt
@@ -319,7 +319,6 @@ utilsexc.cpp        M       B
 uuid.cpp       M       O
 wave.cpp       M
 window.cpp     M
-xpmhand.cpp    M
 
 dialup.cpp     U
 dir.cpp        U       B
@@ -759,7 +758,6 @@ wxchar.h    W       B
 wxexpr.h       W
 wxhtml.h       W
 wxprec.h       W       B
-xpmhand.h      W
 zipstrm.h      W       B
 zstream.h      W       B
 
@@ -978,7 +976,6 @@ treectrl.h  9
 wave.h 9
 window.h       9
 winundef.h     9
-xpmhand.h      9
 # blank.cur    9
 # bullseye.cur 9
 # child.ico    9

diff --git a/src/msw/gdiimage.cpp b/src/msw/gdiimage.cpp
index 276858546f73b4344307ff9ff080422e9240a852..dfc7900a1defbfdea6c20db05e4983113aeefdbf 100644 (file)
--- a/src/msw/gdiimage.cpp
+++ b/src/msw/gdiimage.cpp
@@ -42,7 +42,7 @@
 #include "wx/msw/gdiimage.h"
 #include "wx/bitmap.h"
 
-#if wxUSE_XPM_IN_MSW
+#if 0 // wxUSE_XPM_IN_MSW
 #   include "wx/xpmhand.h"
 #endif // wxUSE_XPM_IN_MSW
 
@@ -304,7 +304,7 @@ void wxGDIImage::InitStandardHandlers()
 
     // 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 wxXPMDataHandler);
 #endif // wxUSE_XPM_IN_MSW

diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index 4851753f16f88ae106f7816521ae4246c323280a..953d25cc2597dc080551c7b81a5602ab9e802154 100644 (file)
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -327,8 +327,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\utilsexc.obj \
                $(MSWDIR)\uuid.obj \
                $(MSWDIR)\wave.obj \
-               $(MSWDIR)\window.obj \
-               $(MSWDIR)\xpmhand.obj
+               $(MSWDIR)\window.obj
 
 HTMLOBJS = $(MSWDIR)\helpctrl.obj \
                $(MSWDIR)\helpdata.obj \

diff --git a/src/msw/makefile.bcc b/src/msw/makefile.bcc
index cd3bc15655d234935018e5a5e196cd47bade74ab..56894f3cb153a429e4f9a6b331b40c85ced6c56a 100644 (file)
--- a/src/msw/makefile.bcc
+++ b/src/msw/makefile.bcc
@@ -279,8 +279,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\utils.obj \
                $(MSWDIR)\utilsexc.obj \
                $(MSWDIR)\wave.obj \
-               $(MSWDIR)\window.obj \
-               $(MSWDIR)\xpmhand.obj
+               $(MSWDIR)\window.obj
 
 OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS)
 

diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index 0e32eda8df14bed3ddd0bda8b52682f0209589db..8f555bfa32d3472195f59d569ad1c8a7aebc7d0d 100644 (file)
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -322,8 +322,7 @@ MSWOBJS     = \
                $(MSWDIR)/utils.$(OBJSUFF) \
                $(MSWDIR)/utilsexc.$(OBJSUFF) \
                $(MSWDIR)/wave.$(OBJSUFF) \
-               $(MSWDIR)/window.$(OBJSUFF) \
-               $(MSWDIR)/xpmhand.$(OBJSUFF)
+               $(MSWDIR)/window.$(OBJSUFF)
 
 ADVANCEDOBJS     = \
                $(COMMDIR)/odbc.$(OBJSUFF) \

diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index 5c0ce082dae7a0fb629571e3a77e4b818be228ee..437f5623ab392f823ce6f661714b947fa8d9a7b3 100644 (file)
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -343,8 +343,7 @@ MSWOBJS = ..\msw\$D\accel.obj \
                ..\msw\$D\utilsexc.obj \
                ..\msw\ole\$D\uuid.obj \
                ..\msw\$D\wave.obj \
-               ..\msw\$D\window.obj \
-               ..\msw\$D\xpmhand.obj
+               ..\msw\$D\window.obj
 
 HTMLOBJS = ..\html\$D\helpctrl.obj \
                ..\html\$D\helpdata.obj \

diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat
index d230d3c653d638bf5205e43c90b694a1137e113b..5ebfeff50f15e025711ec8d78d619671113cb25b 100644 (file)
--- a/src/msw/makefile.wat
+++ b/src/msw/makefile.wat
@@ -305,8 +305,7 @@ MSWOBJS = accel.obj &
        utilsexc.obj &
        uuid.obj &
        wave.obj &
-       window.obj &
-       xpmhand.obj
+       window.obj
 
 # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
 OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS)
@@ -648,8 +647,8 @@ wave.obj:     $(MSWDIR)\wave.cpp
 window.obj:     $(MSWDIR)\window.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-xpmhand.obj:     $(MSWDIR)\xpmhand.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+#xpmhand.obj:     $(MSWDIR)\xpmhand.cpp
+#  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 
 

diff --git a/src/wxvc.dsp b/src/wxvc.dsp
index d46f810391e6518c12be9d7e58fec5aab5a7e960..b9d013b2c05fef50ef85063d000094c3cfe15824 100644 (file)
--- a/src/wxvc.dsp
+++ b/src/wxvc.dsp
@@ -1141,11 +1141,6 @@ SOURCE=.\msw\wave.cpp
 
 SOURCE=.\msw\window.cpp
 # End Source File
-# Begin Source File
-
-SOURCE=.\msw\xpmhand.cpp
-# ADD CPP /I "../src/xpm"
-# End Source File
 # End Group
 # Begin Group "OLE Files"
 

diff --git a/src/wxvc_dll.dsp b/src/wxvc_dll.dsp
index 5466eb46028f70c3cb4ee012180b988ed4474e55..75ec18b949059c1395876cb93946eca14df92793 100644 (file)
--- a/src/wxvc_dll.dsp
+++ b/src/wxvc_dll.dsp
@@ -1139,11 +1139,6 @@ SOURCE=.\msw\wave.cpp
 
 SOURCE=.\msw\window.cpp
 # End Source File
-# Begin Source File
-
-SOURCE=.\msw\xpmhand.cpp
-# ADD CPP /I "../src/xpm"
-# End Source File
 # End Group
 # Begin Group "OLE Files"