diff --git a/wxPython/src/_extras.py b/wxPython/src/_extras.py
index f3032e8ca2..1cc71d3a8b 100644
--- a/wxPython/src/_extras.py
+++ b/wxPython/src/_extras.py
@@ -610,6 +610,8 @@ wxSystemSettings_GetSystemMetric = wxSystemSettings_GetMetric
 
 # workarounds for bad wxRTTI names
 __wxPyPtrTypeMap['wxGauge95']    = 'wxGauge'
+__wxPyPtrTypeMap['wxSlider95']   = 'wxSlider'
+__wxPyPtrTypeMap['wxStatusBar95']   = 'wxStatusBar'
 
 
 
diff --git a/wxPython/src/msw/printfw.cpp b/wxPython/src/msw/printfw.cpp
index 26e406b332..7c69a07c97 100644
--- a/wxPython/src/msw/printfw.cpp
+++ b/wxPython/src/msw/printfw.cpp
@@ -178,7 +178,14 @@ public:
     PYPRIVATE;
 };
 
+// Stupid renamed classes...  Fix this in 2.5...
+#if defined(__WXMSW__)
+IMPLEMENT_CLASS( wxPyPrintPreview, wxWindowsPrintPreview );
+#elif defined(__WXMAC__)
+IMPLEMENT_CLASS( wxPyPrintPreview, wxMacPrintPreview );
+#else
 IMPLEMENT_CLASS( wxPyPrintPreview, wxPrintPreview );
+#endif
 
 IMP_PYCALLBACK_BOOL_INT    (wxPyPrintPreview, wxPrintPreview, SetCurrentPage);
 IMP_PYCALLBACK_BOOL_WXWINDC(wxPyPrintPreview, wxPrintPreview, PaintPage);
diff --git a/wxPython/src/msw/wx.cpp b/wxPython/src/msw/wx.cpp
index 08573fe92e..eef2524501 100644
--- a/wxPython/src/msw/wx.cpp
+++ b/wxPython/src/msw/wx.cpp
@@ -2546,6 +2546,7 @@ SWIGEXPORT(void) initwxc() {
 	 PyDict_SetItemString(d,"wxGROW", PyInt_FromLong((long) wxGROW));
 	 PyDict_SetItemString(d,"wxEXPAND", PyInt_FromLong((long) wxEXPAND));
 	 PyDict_SetItemString(d,"wxNB_FIXEDWIDTH", PyInt_FromLong((long) wxNB_FIXEDWIDTH));
+	 PyDict_SetItemString(d,"wxNB_TOP", PyInt_FromLong((long) wxNB_TOP));
 	 PyDict_SetItemString(d,"wxNB_LEFT", PyInt_FromLong((long) wxNB_LEFT));
 	 PyDict_SetItemString(d,"wxNB_RIGHT", PyInt_FromLong((long) wxNB_RIGHT));
 	 PyDict_SetItemString(d,"wxNB_BOTTOM", PyInt_FromLong((long) wxNB_BOTTOM));
diff --git a/wxPython/src/msw/wx.py b/wxPython/src/msw/wx.py
index 1e5c237e11..8fe466a533 100644
--- a/wxPython/src/msw/wx.py
+++ b/wxPython/src/msw/wx.py
@@ -489,6 +489,7 @@ wxSHRINK = wxc.wxSHRINK
 wxGROW = wxc.wxGROW
 wxEXPAND = wxc.wxEXPAND
 wxNB_FIXEDWIDTH = wxc.wxNB_FIXEDWIDTH
+wxNB_TOP = wxc.wxNB_TOP
 wxNB_LEFT = wxc.wxNB_LEFT
 wxNB_RIGHT = wxc.wxNB_RIGHT
 wxNB_BOTTOM = wxc.wxNB_BOTTOM
@@ -1580,6 +1581,8 @@ wxSystemSettings_GetSystemMetric = wxSystemSettings_GetMetric
 
 # workarounds for bad wxRTTI names
 __wxPyPtrTypeMap['wxGauge95']    = 'wxGauge'
+__wxPyPtrTypeMap['wxSlider95']   = 'wxSlider'
+__wxPyPtrTypeMap['wxStatusBar95']   = 'wxStatusBar'
 
 
 
diff --git a/wxPython/src/printfw.i b/wxPython/src/printfw.i
index 9e521d1da4..eb7eb28640 100644
--- a/wxPython/src/printfw.i
+++ b/wxPython/src/printfw.i
@@ -545,7 +545,14 @@ public:
     PYPRIVATE;
 };
 
+// Stupid renamed classes...  Fix this in 2.5...
+#if defined(__WXMSW__)
+IMPLEMENT_CLASS( wxPyPrintPreview, wxWindowsPrintPreview );
+#elif defined(__WXMAC__)
+IMPLEMENT_CLASS( wxPyPrintPreview, wxMacPrintPreview );
+#else
 IMPLEMENT_CLASS( wxPyPrintPreview, wxPrintPreview );
+#endif
 
 IMP_PYCALLBACK_BOOL_INT    (wxPyPrintPreview, wxPrintPreview, SetCurrentPage);
 IMP_PYCALLBACK_BOOL_WXWINDC(wxPyPrintPreview, wxPrintPreview, PaintPage);