Frame and Window coding

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

diff --git a/src/msw/statbr95.cpp b/src/msw/statbr95.cpp
index c628c89235c4f932b9b4b984513c210f09e33c26..a3c3bdb670e51dba200baa55b2737cb60be2dabd 100644 (file)
--- a/src/msw/statbr95.cpp
+++ b/src/msw/statbr95.cpp
@@ -29,14 +29,15 @@
 
 #if defined(__WIN95__) && wxUSE_NATIVE_STATUSBAR
 
+#include "wx/intl.h"
 #include "wx/log.h"
 #include "wx/statusbr.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
 
 // ----------------------------------------------------------------------------
@@ -64,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,
@@ -77,7 +79,7 @@ LRESULT APIENTRY wxStatusBarProc(HWND hwnd,
         sb->MSWWindowProc(message, wParam, lParam);
     }
 
-    return ::CallWindowProc(gs_wndprocStatBar, hwnd, message, wParam, lParam);
+    return ::CallWindowProc(CASTWNDPROC gs_wndprocStatBar, hwnd, message, wParam, lParam);
 }
 
 // ============================================================================
@@ -129,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
-    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);
 
@@ -156,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") );