diff --git a/include/wx/msw/winundef.h b/include/wx/msw/winundef.h
index 6af2f389cc..96c5a06e8e 100644
--- a/include/wx/msw/winundef.h
+++ b/include/wx/msw/winundef.h
@@ -187,6 +187,16 @@
     }
 #endif
 
+// IsMaximized
+
+#ifdef IsMaximized
+    #undef IsMaximized
+    inline BOOL IsMaximized(HWND hwnd)
+    {
+        return IsZoomed(hwnd);
+    }
+#endif
+
 // For WINE
 
 #if defined(GetWindowStyle) || defined(__WXWINE__)
diff --git a/samples/bombs/makefile.dos b/samples/bombs/makefile.dos
index ff40632c83..8af1fd0b57 100644
--- a/samples/bombs/makefile.dos
+++ b/samples/bombs/makefile.dos
@@ -11,8 +11,7 @@
 WXDIR = $(WXWIN)
 
 TARGET=bombs
-OBJECTS=dialoged.obj reseditr.obj dlghndlr.obj reswrite.obj\
-  winprop.obj edtree.obj edlist.obj symbtabl.obj winstyle.obj
+OBJECTS = $(TARGET).obj bombs1.obj game.obj
 
 !include $(WXDIR)\src\makeprog.msc
 
diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp
index e0531d76f8..00c1f53a1e 100644
--- a/samples/controls/controls.cpp
+++ b/samples/controls/controls.cpp
@@ -23,7 +23,9 @@
     #include "wx/wx.h"
 #endif
 
+#if !defined( __WXMSW__ ) || defined( __WIN95__ )
 #include "wx/spinbutt.h"
+#endif
 #include "wx/notebook.h"
 #include "wx/imaglist.h"
 
diff --git a/samples/dynamic/dynamic.def b/samples/dynamic/dynamic.def
index 6d63d054d5..c45d4bd662 100644
--- a/samples/dynamic/dynamic.def
+++ b/samples/dynamic/dynamic.def
@@ -1,4 +1,4 @@
-NAME         Dynamic
+NAME         Dynamik
 DESCRIPTION  'Dynamic event handler test'
 EXETYPE      WINDOWS
 STUB         'WINSTUB.EXE'
@@ -6,3 +6,4 @@ CODE         PRELOAD MOVEABLE DISCARDABLE
 DATA         PRELOAD MOVEABLE MULTIPLE
 HEAPSIZE     4048
 STACKSIZE    16000
+
diff --git a/samples/makefile.dos b/samples/makefile.dos
index 4feacd5d06..8537373e54 100644
--- a/samples/makefile.dos
+++ b/samples/makefile.dos
@@ -16,145 +16,283 @@ WXDIR = $(WXWIN)
 
 THISDIR=$(WXDIR)\samples
 
+#
+# Indicates kind of pb with samples
+#
+# No makefile.dos file
+NOMAKE=1
+# No 16 bit version
+ONLY32=1
+# PNG unresolved
+PNGSETUP=1
+# DND not set in setup.h
+DNDSETUP=1
+# Misc. compilation errors
+COMPIL=1
+
 !include $(WXDIR)\src\makemsc.env
 
+#
+# Please keep samples list up-to-date, in alphabetical order
+#
 all:
-        cd $(WXDIR)\samples\splitter
+        cd $(WXDIR)\samples\bombs
         nmake -f makefile.dos FINAL=$(FINAL)
-        cd $(WXDIR)\samples\resource
+        cd $(WXDIR)\samples\caret
+        nmake -f makefile.dos FINAL=$(FINAL)
+        cd $(WXDIR)\samples\checklst
+        nmake -f makefile.dos FINAL=$(FINAL)
+        cd $(WXDIR)\samples\config
         nmake -f makefile.dos FINAL=$(FINAL)
         cd $(WXDIR)\samples\controls
         nmake -f makefile.dos FINAL=$(FINAL)
-        cd $(WXDIR)\samples\listctrl
+!if "$(COMPIL)"==""
+        cd $(WXDIR)\samples\db
         nmake -f makefile.dos FINAL=$(FINAL)
-        cd $(WXDIR)\samples\treectrl
-        nmake -f makefile.dos FINAL=$(FINAL)
-        cd $(WXDIR)\samples\validate
-        nmake -f makefile.dos FINAL=$(FINAL)
-        cd $(WXDIR)\samples\mdi
-        nmake -f makefile.dos FINAL=$(FINAL)
-        cd $(WXDIR)\samples\minimal
-        nmake -f makefile.dos FINAL=$(FINAL)
-        cd $(WXDIR)\samples\layout
-        nmake -f makefile.dos FINAL=$(FINAL)
-        cd $(WXDIR)\samples\printing
-        nmake -f makefile.dos FINAL=$(FINAL)
-        cd $(WXDIR)\samples\toolbar
+!endif
+        cd $(WXDIR)\samples\dde
         nmake -f makefile.dos FINAL=$(FINAL)
         cd $(WXDIR)\samples\dialogs
         nmake -f makefile.dos FINAL=$(FINAL)
+!if "$(DNDSETUP)"==""
+        cd $(WXDIR)\samples\dnd
+        nmake -f makefile.dos FINAL=$(FINAL)
+!endif
         cd $(WXDIR)\samples\docview
         nmake -f makefile.dos FINAL=$(FINAL)
         cd $(WXDIR)\samples\docvwmdi
         nmake -f makefile.dos FINAL=$(FINAL)
-        cd $(WXDIR)\samples\controls
+        cd $(WXDIR)\samples\drawing
         nmake -f makefile.dos FINAL=$(FINAL)
-        cd $(WXDIR)\samples\nativdlg
+        cd $(WXDIR)\samples\dynamic
+        nmake -f makefile.dos FINAL=$(FINAL)
+        cd $(WXDIR)\samples\forty
+        nmake -f makefile.dos FINAL=$(FINAL)
+        cd $(WXDIR)\samples\fractal
         nmake -f makefile.dos FINAL=$(FINAL)
         cd $(WXDIR)\samples\grid
         nmake -f makefile.dos FINAL=$(FINAL)
-        cd $(WXDIR)\samples\internat
+!if "$(NOMAKE)"==""
+        cd $(WXDIR)\samples\help
         nmake -f makefile.dos FINAL=$(FINAL)
-        cd $(WXDIR)\samples\dnd
+        cd $(WXDIR)\samples\html
+        nmake -f makefile.dos FINAL=$(FINAL)
+!endif
+!if "$(PNGSETUP)"==""
+        cd $(WXDIR)\samples\image
+        nmake -f makefile.dos FINAL=$(FINAL)
+!endif
+        cd $(WXDIR)\samples\internat
         nmake -f makefile.dos FINAL=$(FINAL)
         cd $(WXDIR)\samples\joytest
         nmake -f makefile.dos FINAL=$(FINAL)
-        cd $(WXDIR)\samples\taskbar
+        cd $(WXDIR)\samples\layout
         nmake -f makefile.dos FINAL=$(FINAL)
-        cd $(WXDIR)\samples\sashtest
+        cd $(WXDIR)\samples\listctrl
+        nmake -f makefile.dos FINAL=$(FINAL)
+        cd $(WXDIR)\samples\mdi
         nmake -f makefile.dos FINAL=$(FINAL)
 !if "$(FINAL)" == "0"
         cd $(WXDIR)\samples\memcheck
+        nmake -f makefile.dos FINAL=$(FINAL)
 !endif
+!if "$(COMPIL)"==""
+        cd $(WXDIR)\samples\mfc
         nmake -f makefile.dos FINAL=$(FINAL)
-        cd $(WXDIR)\samples\ownerdrw
-        nmake -f makefile.dos FINAL=$(FINAL)
-        cd $(WXDIR)\samples\checklst
-        nmake -f makefile.dos FINAL=$(FINAL)
+!endif
         cd $(WXDIR)\samples\minifram
         nmake -f makefile.dos FINAL=$(FINAL)
-        cd $(WXDIR)\samples\bombs
+        cd $(WXDIR)\samples\minimal
         nmake -f makefile.dos FINAL=$(FINAL)
-        cd $(WXDIR)\samples\fractal
+!if "$(ONLY32)"==""
+        cd $(WXDIR)\samples\nativdlg
         nmake -f makefile.dos FINAL=$(FINAL)
-        cd $(WXDIR)\samples\wxpoem
+!endif
+        cd $(WXDIR)\samples\notebook
         nmake -f makefile.dos FINAL=$(FINAL)
-        cd $(WXDIR)\samples\typetest
+!if "$(NOMAKE)"==""
+        cd $(WXDIR)\samples\oleauto
+        nmake -f makefile.dos FINAL=$(FINAL)
+!endif
+        cd $(WXDIR)\samples\ownerdrw
+        nmake -f makefile.dos FINAL=$(FINAL)
+!if "$(NOMAKE)"==""
+        cd $(WXDIR)\samples\png
+        nmake -f makefile.dos FINAL=$(FINAL)
+!endif
+        cd $(WXDIR)\samples\printing
         nmake -f makefile.dos FINAL=$(FINAL)
         cd $(WXDIR)\samples\proplist
         nmake -f makefile.dos FINAL=$(FINAL)
-        cd $(WXDIR)\samples\image
+!if "$(NOMAKE)"==""
+        cd $(WXDIR)\samples\regtest
         nmake -f makefile.dos FINAL=$(FINAL)
-        cd $(WXDIR)\samples\dde
+!endif
+        cd $(WXDIR)\samples\resource
         nmake -f makefile.dos FINAL=$(FINAL)
-#        cd $(WXDIR)\samples\regtest
-#        nmake -f makefile.dos FINAL=$(FINAL)
-
-clean:
+!if "$(NOMAKE)"==""
+        cd $(WXDIR)\samples\richedit
+        nmake -f makefile.dos FINAL=$(FINAL)
+        cd $(WXDIR)\samples\sashtest
+        nmake -f makefile.dos FINAL=$(FINAL)
+!endif
+!if "$(PNGSETUP)"==""
+        cd $(WXDIR)\samples\scroll
+        nmake -f makefile.dos FINAL=$(FINAL)
+!endif
         cd $(WXDIR)\samples\splitter
-        nmake -f makefile.dos clean
-        cd $(WXDIR)\samples\mdi
-        nmake -f makefile.dos clean
-        cd $(WXDIR)\samples\minimal
-        nmake -f makefile.dos clean
-        cd $(WXDIR)\samples\layout
-        nmake -f makefile.dos clean
-        cd $(WXDIR)\samples\printing
-        nmake -f makefile.dos clean
+        nmake -f makefile.dos FINAL=$(FINAL)
+!if "$(COMPIL)"==""
+        cd $(WXDIR)\samples\tab
+        nmake -f makefile.dos FINAL=$(FINAL)
+        cd $(WXDIR)\samples\taskbar
+        nmake -f makefile.dos FINAL=$(FINAL)
+!endif
+        cd $(WXDIR)\samples\text
+        nmake -f makefile.dos FINAL=$(FINAL)
+!if "$(ONLY32)"==""
+        cd $(WXDIR)\samples\thread
+        nmake -f makefile.dos FINAL=$(FINAL)
+!endif
         cd $(WXDIR)\samples\toolbar
+        nmake -f makefile.dos FINAL=$(FINAL)
+!if "$(PNGSETUP)"==""
+        cd $(WXDIR)\samples\treectrl
+        nmake -f makefile.dos FINAL=$(FINAL)
+!endif
+!if "$(COMPIL)"==""
+        cd $(WXDIR)\samples\typetest
+        nmake -f makefile.dos FINAL=$(FINAL)
+!endif
+        cd $(WXDIR)\samples\validate
+        nmake -f makefile.dos FINAL=$(FINAL)
+!if "$(NOMAKE)"==""
+        cd $(WXDIR)\samples\wizard
+        nmake -f makefile.dos FINAL=$(FINAL)
+!endif
+        cd $(WXDIR)\samples\wxpoem
+        nmake -f makefile.dos FINAL=$(FINAL)
+!if "$(COMPIL)"==""
+        cd $(WXDIR)\samples\wxsocket
+        nmake -f makefile.dos FINAL=$(FINAL)
+!endif
+clean:
+        cd $(WXDIR)\samples\bombs
+        nmake -f makefile.dos clean
+        cd $(WXDIR)\samples\caret
+        nmake -f makefile.dos clean
+        cd $(WXDIR)\samples\checklst
+        nmake -f makefile.dos clean
+        cd $(WXDIR)\samples\config
+        nmake -f makefile.dos clean
+        cd $(WXDIR)\samples\controls
+        nmake -f makefile.dos clean
+        cd $(WXDIR)\samples\db
+        nmake -f makefile.dos clean
+        cd $(WXDIR)\samples\dde
         nmake -f makefile.dos clean
         cd $(WXDIR)\samples\dialogs
         nmake -f makefile.dos clean
-        cd $(WXDIR)\samples\resource
-        nmake -f makefile.dos clean
-        cd $(WXDIR)\samples\listctrl
-        nmake -f makefile.dos clean
-        cd $(WXDIR)\samples\treectrl
-        nmake -f makefile.dos clean
-        cd $(WXDIR)\samples\validate
+        cd $(WXDIR)\samples\dnd
         nmake -f makefile.dos clean
         cd $(WXDIR)\samples\docview
         nmake -f makefile.dos clean
         cd $(WXDIR)\samples\docvwmdi
         nmake -f makefile.dos clean
-        cd $(WXDIR)\samples\controls
+        cd $(WXDIR)\samples\drawing
         nmake -f makefile.dos clean
-        cd $(WXDIR)\samples\nativdlg
+        cd $(WXDIR)\samples\dynamic
         nmake -f makefile.dos clean
-        cd $(WXDIR)\samples\grid
-        nmake -f makefile.dos clean
-        cd $(WXDIR)\samples\internat
-        nmake -f makefile.dos clean
-        cd $(WXDIR)\samples\checklst
-        nmake -f makefile.dos clean
-        cd $(WXDIR)\samples\ownerdrw
-        nmake -f makefile.dos clean
-        cd $(WXDIR)\samples\dnd
-        nmake -f makefile.dos clean
-        cd $(WXDIR)\samples\joytest
-        nmake -f makefile.dos clean
-        cd $(WXDIR)\samples\regtest
-        nmake -f makefile.dos clean
-        cd $(WXDIR)\samples\taskbar
-        nmake -f makefile.dos clean
-        cd $(WXDIR)\samples\sashtest
-        nmake -f makefile.dos clean
-        cd $(WXDIR)\samples\memcheck
-        nmake -f makefile.dos clean
-        cd $(WXDIR)\samples\minifram
-        nmake -f makefile.dos clean
-        cd $(WXDIR)\samples\bombs
+        cd $(WXDIR)\samples\forty
         nmake -f makefile.dos clean
         cd $(WXDIR)\samples\fractal
         nmake -f makefile.dos clean
-        cd $(WXDIR)\samples\wxpoem
+        cd $(WXDIR)\samples\grid
         nmake -f makefile.dos clean
-        cd $(WXDIR)\samples\typetest
+!if "$(NOMAKE)"==""
+        cd $(WXDIR)\samples\help
+        nmake -f makefile.dos clean
+        cd $(WXDIR)\samples\html
+        nmake -f makefile.dos clean
+!endif
+        cd $(WXDIR)\samples\image
+        nmake -f makefile.dos clean
+        cd $(WXDIR)\samples\internat
+        nmake -f makefile.dos clean
+        cd $(WXDIR)\samples\joytest
+        nmake -f makefile.dos clean
+        cd $(WXDIR)\samples\layout
+        nmake -f makefile.dos clean
+        cd $(WXDIR)\samples\listctrl
+        nmake -f makefile.dos clean
+        cd $(WXDIR)\samples\mdi
+        nmake -f makefile.dos clean
+!if "$(FINAL)" == "0"
+        cd $(WXDIR)\samples\memcheck
+        nmake -f makefile.dos clean
+!endif
+        cd $(WXDIR)\samples\mfc
+        nmake -f makefile.dos clean
+        cd $(WXDIR)\samples\minifram
+        nmake -f makefile.dos clean
+        cd $(WXDIR)\samples\minimal
+        nmake -f makefile.dos clean
+        cd $(WXDIR)\samples\nativdlg
+        nmake -f makefile.dos clean
+        cd $(WXDIR)\samples\notebook
+        nmake -f makefile.dos clean
+!if "$(NOMAKE)"==""
+        cd $(WXDIR)\samples\oleauto
+        nmake -f makefile.dos clean
+!endif
+        cd $(WXDIR)\samples\ownerdrw
+        nmake -f makefile.dos clean
+!if "$(NOMAKE)"==""
+        cd $(WXDIR)\samples\png
+        nmake -f makefile.dos clean
+!endif
+        cd $(WXDIR)\samples\printing
         nmake -f makefile.dos clean
         cd $(WXDIR)\samples\proplist
         nmake -f makefile.dos clean
-        cd $(WXDIR)\samples\image
+!if "$(NOMAKE)"==""
+        cd $(WXDIR)\samples\regtest
         nmake -f makefile.dos clean
-        cd $(WXDIR)\samples\dde
+!endif
+        cd $(WXDIR)\samples\resource
+        nmake -f makefile.dos clean
+!if "$(NOMAKE)"==""
+        cd $(WXDIR)\samples\richedit
+        nmake -f makefile.dos clean
+        cd $(WXDIR)\samples\sashtest
+        nmake -f makefile.dos clean
+!endif
+        cd $(WXDIR)\samples\scroll
+        nmake -f makefile.dos clean
+        cd $(WXDIR)\samples\splitter
+        nmake -f makefile.dos clean
+        cd $(WXDIR)\samples\tab
+        nmake -f makefile.dos clean
+        cd $(WXDIR)\samples\taskbar
+        nmake -f makefile.dos clean
+        cd $(WXDIR)\samples\text
+        nmake -f makefile.dos clean
+        cd $(WXDIR)\samples\thread
+        nmake -f makefile.dos clean
+        cd $(WXDIR)\samples\toolbar
+        nmake -f makefile.dos clean
+        cd $(WXDIR)\samples\treectrl
+        nmake -f makefile.dos clean
+        cd $(WXDIR)\samples\typetest
+        nmake -f makefile.dos clean
+        cd $(WXDIR)\samples\validate
+        nmake -f makefile.dos clean
+!if "$(NOMAKE)"==""
+        cd $(WXDIR)\samples\wizard
+        nmake -f makefile.dos clean
+!endif
+        cd $(WXDIR)\samples\wxpoem
+        nmake -f makefile.dos clean
+        cd $(WXDIR)\samples\wxsocket
         nmake -f makefile.dos clean
 
diff --git a/samples/text/makefile.dos b/samples/text/makefile.dos
index f1170311a5..85df6b5b3a 100644
--- a/samples/text/makefile.dos
+++ b/samples/text/makefile.dos
@@ -10,7 +10,7 @@
 
 WXDIR = $(WXWIN)
 
-TARGET=controls
+TARGET=text
 OBJECTS=$(TARGET).obj
 
 !include $(WXDIR)\src\makeprog.msc
diff --git a/src/msw/makefile.dos b/src/msw/makefile.dos
index 137a57c87a..3b1d7fe0cd 100644
--- a/src/msw/makefile.dos
+++ b/src/msw/makefile.dos
@@ -131,6 +131,7 @@ COMMONOBJS = \
 		$(COMMDIR)\odbc.obj \
 		$(COMMDIR)\paper.obj \
 		$(COMMDIR)\prntbase.obj \
+		$(COMMDIR)\process.obj \
 		$(COMMDIR)\resource.obj \
 		$(COMMDIR)\sizer.obj \
 		$(COMMDIR)\strconv.obj \
@@ -910,6 +911,11 @@ $(COMMDIR)/prntbase.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(COMMDIR)/process.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(COMMDIR)/resource.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
diff --git a/src/msw/nativdlg.cpp b/src/msw/nativdlg.cpp
index 8db2ed7b57..f85ff12896 100644
--- a/src/msw/nativdlg.cpp
+++ b/src/msw/nativdlg.cpp
@@ -34,7 +34,9 @@
     #include "wx/wx.h"
 #endif
 
+#if defined(__WIN95__) && !defined(__TWIN32__)
 #include "wx/spinbutt.h"
+#endif
 #include "wx/msw/private.h"
 
 // ---------------------------------------------------------------------------