give focus to show top level windows

[wxWidgets.git] / distrib / msw / tmake / dos.t

diff --git a/distrib/msw/tmake/dos.t b/distrib/msw/tmake/dos.t
index 893c2144602871e064f9d9e309831446dd01284d..cd39f8e555339e285d492a2474e23b91d800b14b 100644 (file)
--- a/distrib/msw/tmake/dos.t
+++ b/distrib/msw/tmake/dos.t
@@ -14,7 +14,7 @@
     #! now transform these hashes into $project tags
     foreach $file (sort keys %wxGeneric) {
         if ( $wxGeneric{$file} =~ /\b(PS|G|U)\b/ ) {
-            #! this file for some reason wasn't compiled for VC++ 1.52
+            #! Need this file too since it has wxGenericPageSetupDialog
             next unless $file =~ /^prntdlgg\./;
         }
 
@@ -78,12 +78,10 @@ DUMMYOBJ=dummy.obj
 # This one overrides the others, to be consistent with the settings in wx_setup.h
 MINIMAL_WXWINDOWS_SETUP=0
 
-USE_XPM_IN_MSW=1
 USE_CTL3D=1
 
 !if "$(MINIMAL_WXWINDOWS_SETUP)" == "1"
 USE_CTL3D=0
-USE_XPM_IN_MSW=0
 !endif
 
 PERIPH_LIBS=
@@ -94,12 +92,6 @@ PERIPH_CLEAN_TARGET=
 # PERIPH_LIBS=d:\msdev\lib\ctl3d32.lib $(PERIPH_LIBS)
 # !endif
 
-!if "$(USE_XPM_IN_MSW)" == "1"
-PERIPH_LIBS=$(WXDIR)\lib\xpm.lib $(PERIPH_LIBS)
-PERIPH_TARGET=xpm $(PERIPH_TARGET)
-PERIPH_CLEAN_TARGET=clean_xpm $(PERIPH_CLEAN_TARGET)
-!endif
-
 # PNG and Zlib
 PERIPH_TARGET=png zlib $(PERIPH_TARGET)
 PERIPH_CLEAN_TARGET=clean_png clean_zlib $(PERIPH_CLEAN_TARGET)
@@ -124,10 +116,6 @@ MSWOBJS1 = #$ ExpandList("WXMSWOBJS1");
 
 MSWOBJS2 = #$ ExpandList("WXMSWOBJS2");
 
-# TODO: Implement XPM and PNG targets in this makefile!
-#  $(OLEDIR)\xpmhand \
-#  $(OLEDIR)\pnghand \
-
 OBJECTS = $(COMMONOBJS1) $(COMMONOBJS2) $(GENERICOBJS) $(MSWOBJS1) $(MSWOBJS2)
 
 # Normal, static library
@@ -235,18 +223,6 @@ $(OBJECTS):        $(WXDIR)/include/wx/setup.h
 
 # Peripheral components
 
-$(WXDIR)\lib\xpm.lib: xpm
-
-xpm:
-    cd $(WXDIR)\src\xpm
-    nmake -f makefile.dos FINAL=$(FINAL)
-    cd $(WXDIR)\src\msw
-
-clean_xpm:
-    cd $(WXDIR)\src\xpm
-    nmake -f makefile.dos clean
-    cd $(WXDIR)\src\msw
-
 zlib:
     cd $(WXDIR)\src\zlib
     nmake -f makefile.dos FINAL=$(FINAL)