Fix to MDI to restore 3D border; kludge to OGL Studio sample to redraw

[wxWidgets.git] / src / msw / statbr95.cpp

diff --git a/src/msw/statbr95.cpp b/src/msw/statbr95.cpp
index 3cb1a61dbb94f0eb8716c3b83bdb88604a03b521..a3c3bdb670e51dba200baa55b2737cb60be2dabd 100644 (file)
--- a/src/msw/statbr95.cpp
+++ b/src/msw/statbr95.cpp
@@ -36,8 +36,8 @@
 #include "wx/msw/private.h"
 #include <windowsx.h>
 
 #include "wx/msw/private.h"
 #include <windowsx.h>
 

-#if !defined(__GNUWIN32__) || defined(__TWIN32__) || defined(wxUSE_NORLANDER_HEADERS)
-#include <commctrl.h>
+#if !(defined(__GNUWIN32_OLD__) || defined(__TWIN32__))
+    #include <commctrl.h>

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------


@@ -65,7 +65,8 @@ END_EVENT_TABLE()
 //
 // ----------------------------------------------------------------------------
 
 //
 // ----------------------------------------------------------------------------
 

-static WNDPROC gs_wndprocStatBar = NULL;
+// static WNDPROC gs_wndprocStatBar = NULL;
+static WXFARPROC gs_wndprocStatBar = (WXFARPROC) NULL;

 
 LRESULT APIENTRY wxStatusBarProc(HWND hwnd,
                                  UINT message,
 
 LRESULT APIENTRY wxStatusBarProc(HWND hwnd,
                                  UINT message,


@@ -130,7 +131,7 @@ bool wxStatusBar95::Create(wxWindow *parent,
     //  SubclassWin(m_hWnd);
 
     // but we want to process the messages from it still, so must subclass it
     //  SubclassWin(m_hWnd);
 
     // but we want to process the messages from it still, so must subclass it

-    gs_wndprocStatBar = (WNDPROC)GetWindowLong(GetHwnd(), GWL_WNDPROC);
+    gs_wndprocStatBar = (WXFARPROC)GetWindowLong(GetHwnd(), GWL_WNDPROC);

     SetWindowLong(GetHwnd(), GWL_WNDPROC, (LONG)wxStatusBarProc);
     SetWindowLong(GetHwnd(), GWL_USERDATA, (LONG)this);
 
     SetWindowLong(GetHwnd(), GWL_WNDPROC, (LONG)wxStatusBarProc);
     SetWindowLong(GetHwnd(), GWL_USERDATA, (LONG)this);
 


@@ -157,7 +158,7 @@ void wxStatusBar95::CopyFieldsWidth(const int widths[])
   }
 }
 
   }
 }
 

-void wxStatusBar95::SetFieldsCount(int nFields, const int widths[])
+void wxStatusBar95::SetFieldsCount(int nFields, const int *widths)

 {
   // this is Windows limitation
   wxASSERT_MSG( (nFields > 0) && (nFields < 255), _T("too many fields") );
 {
   // this is Windows limitation
   wxASSERT_MSG( (nFields > 0) && (nFields < 255), _T("too many fields") );