diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h
index 78d36bd920..0e197f0482 100644
--- a/include/wx/gdicmn.h
+++ b/include/wx/gdicmn.h
@@ -264,11 +264,17 @@ public:
     wxPoint GetPosition() const { return wxPoint(x, y); }
     wxSize GetSize() const { return wxSize(width, height); }
 
+    // MFC-like functions
+
     long GetLeft()   const { return x; }
     long GetTop()    const { return y; }
-    long GetBottom() const { return y + height; }
-    long GetRight()  const { return x + width; }
+    long GetBottom() const { return y + height - 1; }
+    long GetRight()  const { return x + width - 1; }
 
+    void SetLeft(long left) { x = left; }
+    void SetRight(long right) { width = right - x + 1; }
+    void SetTop(long top) { y = top; }
+    void SetBottom(long bottom) { height = bottom - y + 1; }
 
     bool operator==(const wxRect& rect) const;
     bool operator!=(const wxRect& rect) const { return !(*this == rect); }
diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index fb83bf2658..fc1751489c 100644
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -118,6 +118,8 @@
 
 #define wxUSE_DOC_VIEW_ARCHITECTURE 1
                                   // Set to 0 to disable document/view architecture
+#define wxUSE_MDI_ARCHITECTURE  1
+                                  // Set to 0 to disable MDI document/view architecture
 #define wxUSE_PRINTING_ARCHITECTURE  1
                                     // Set to 0 to disable print/preview architecture code
 #define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1
diff --git a/samples/makefile.vc b/samples/makefile.vc
index 2eb883cff6..bd495eae05 100644
--- a/samples/makefile.vc
+++ b/samples/makefile.vc
@@ -66,6 +66,8 @@ all:
         nmake -f makefile.vc FINAL=$(FINAL)
         cd $(WXDIR)\samples\sashtest
         nmake -f makefile.vc FINAL=$(FINAL)
+        cd $(WXDIR)\samples\config
+        nmake -f makefile.vc FINAL=$(FINAL)
 !if "$(FINAL)" == "0"
         cd $(WXDIR)\samples\memcheck
 !endif
@@ -149,6 +151,8 @@ clean:
         nmake -f makefile.vc clean
         cd $(WXDIR)\samples\sashtest
         nmake -f makefile.vc clean
+        cd $(WXDIR)\samples\config
+        nmake -f makefile.vc clean
         cd $(WXDIR)\samples\memcheck
         nmake -f makefile.vc clean
         cd $(WXDIR)\samples\minifram
diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index bcaa1278de..bf92a7eccb 100644
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -68,7 +68,7 @@ GENERICOBJS= \
   $(GENDIR)/splitter.$(OBJSUFF) \
   $(GENDIR)/statusbr.$(OBJSUFF) \
   $(GENDIR)/tabg.$(OBJSUFF) \
-  $(GENDIR)/textdlgg.$(OBJSUFF)
+  $(GENDIR)/textdlgg.$(OBJSUFF) \
   $(GENDIR)/tipdlg.$(OBJSUFF)
 
 #  $(GENDIR)/colrdlgg.$(OBJSUFF) \
diff --git a/src/msw/statline.cpp b/src/msw/statline.cpp
index 5737b15039..46df810d04 100644
--- a/src/msw/statline.cpp
+++ b/src/msw/statline.cpp
@@ -29,6 +29,8 @@
 
 #include "wx/statline.h"
 
+#if wxUSE_STATLINE
+
 #include "wx/msw/private.h"
 
 // ============================================================================
@@ -83,4 +85,5 @@ bool wxStaticLine::Create( wxWindow *parent,
 
     return TRUE;
 }
+#endif