Had missed one LPSTR.

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

diff --git a/src/msw/statbr95.cpp b/src/msw/statbr95.cpp
index efc4a698c8882c160e5fc502ddb59e19f5764985..2263d1a3bbf71fce23443f6938cb68067ff1d85c 100644 (file)
--- a/src/msw/statbr95.cpp
+++ b/src/msw/statbr95.cpp
@@ -13,14 +13,6 @@
 #pragma implementation "statbr95.h"
 #endif
 
 #pragma implementation "statbr95.h"
 #endif
 

-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-

 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -35,25 +27,25 @@
   #include "wx/dcclient.h"
 #endif
 
   #include "wx/dcclient.h"
 #endif
 

-#include "wx/log.h"
+#ifdef __WIN95__

 
 

+#include "wx/log.h"

 #include "wx/generic/statusbr.h"
 #include "wx/msw/statbr95.h"
 
 #include "wx/generic/statusbr.h"
 #include "wx/msw/statbr95.h"
 

-#include  <windows.h>
-#include  <windowsx.h>
+#include "wx/msw/private.h"
+#include <windowsx.h>

 
 

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

 #endif
 
 #endif
 

-#if     USE_NATIVE_STATUSBAR
+#if wxUSE_NATIVE_STATUSBAR

 
 #if     !USE_SHARED_LIBRARY
   IMPLEMENT_DYNAMIC_CLASS(wxStatusBar95, wxStatusBar);
 
   BEGIN_EVENT_TABLE(wxStatusBar95, wxStatusBar)
 
 #if     !USE_SHARED_LIBRARY
   IMPLEMENT_DYNAMIC_CLASS(wxStatusBar95, wxStatusBar);
 
   BEGIN_EVENT_TABLE(wxStatusBar95, wxStatusBar)

-    EVT_PAINT(wxWindow::OnPaint)

     EVT_SIZE(wxStatusBar95::OnSize)
   END_EVENT_TABLE()
 #endif  //USE_SHARED_LIBRARY
     EVT_SIZE(wxStatusBar95::OnSize)
   END_EVENT_TABLE()
 #endif  //USE_SHARED_LIBRARY


@@ -65,9 +57,9 @@
 
 // windowsx.h and commctrl.h don't define those, so we do it here
 #define StatusBar_SetParts(h, n, w) SendMessage(h, SB_SETPARTS, (WPARAM)n, (LPARAM)w)
 
 // windowsx.h and commctrl.h don't define those, so we do it here
 #define StatusBar_SetParts(h, n, w) SendMessage(h, SB_SETPARTS, (WPARAM)n, (LPARAM)w)

-#define StatusBar_SetText(h, n, t)  SendMessage(h, SB_SETTEXT, (WPARAM)n, (LPARAM)(LPCSTR)t)
+#define StatusBar_SetText(h, n, t)  SendMessage(h, SB_SETTEXT, (WPARAM)n, (LPARAM)(LPCTSTR)t)

 #define StatusBar_GetTextLen(h, n)  LOWORD(SendMessage(h, SB_GETTEXTLENGTH, (WPARAM)n, 0))
 #define StatusBar_GetTextLen(h, n)  LOWORD(SendMessage(h, SB_GETTEXTLENGTH, (WPARAM)n, 0))

-#define StatusBar_GetText(h, n, s)  LOWORD(SendMessage(h, SB_GETTEXT, (WPARAM)n, (LPARAM)(LPSTR)s))
+#define StatusBar_GetText(h, n, s)  LOWORD(SendMessage(h, SB_GETTEXT, (WPARAM)n, (LPARAM)(LPTSTR)s))

 
 #define hwnd      ((HWND)m_hWnd)
 
 
 #define hwnd      ((HWND)m_hWnd)
 


@@ -95,18 +87,21 @@ bool wxStatusBar95::Create(wxWindow *parent, wxWindowID id, long style)
 {
   SetParent(parent);
 
 {
   SetParent(parent);
 

-  m_windowId = id == -1 ? NewControlId() : id;
+  if (id == -1)
+    m_windowId = NewControlId();
+  else
+    m_windowId = id;

 
   DWORD wstyle = WS_CHILD | WS_VISIBLE;
   if ( style & wxST_SIZEGRIP )
     wstyle |= SBARS_SIZEGRIP;
 
   m_hWnd = (WXHWND)CreateStatusWindow(wstyle,
 
   DWORD wstyle = WS_CHILD | WS_VISIBLE;
   if ( style & wxST_SIZEGRIP )
     wstyle |= SBARS_SIZEGRIP;
 
   m_hWnd = (WXHWND)CreateStatusWindow(wstyle,

-                                      "",
+                                      _T(""),

                                       (HWND)parent->GetHWND(),
                                       m_windowId);
   if ( m_hWnd == 0 ) {
                                       (HWND)parent->GetHWND(),
                                       m_windowId);
   if ( m_hWnd == 0 ) {

-    wxLogSysError("can't create status bar window");
+    wxLogSysError(_T("can't create status bar window"));

     return FALSE;
   }
 
     return FALSE;
   }
 


@@ -116,7 +111,7 @@ bool wxStatusBar95::Create(wxWindow *parent, wxWindowID id, long style)
   return TRUE;
 }
 
   return TRUE;
 }
 

-void wxStatusBar95::CopyFieldsWidth(int *widths)
+void wxStatusBar95::CopyFieldsWidth(const int widths[])

 {
   if (widths && !m_statusWidths)
     m_statusWidths = new int[m_nFields];
 {
   if (widths && !m_statusWidths)
     m_statusWidths = new int[m_nFields];


@@ -131,7 +126,7 @@ void wxStatusBar95::CopyFieldsWidth(int *widths)
   }
 }
 
   }
 }
 

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

 {
   wxASSERT( (nFields > 0) && (nFields < 255) );
 
 {
   wxASSERT( (nFields > 0) && (nFields < 255) );
 


@@ -141,7 +136,7 @@ void wxStatusBar95::SetFieldsCount(int nFields, int *widths)
   SetFieldsWidth();
 }
 
   SetFieldsWidth();
 }
 

-void wxStatusBar95::SetStatusWidths(int n, int *widths)
+void wxStatusBar95::SetStatusWidths(int n, const int widths[])

 {
   // @@ I don't understand what this function is for...
   wxASSERT( n == m_nFields );
 {
   // @@ I don't understand what this function is for...
   wxASSERT( n == m_nFields );


@@ -161,7 +156,7 @@ void wxStatusBar95::SetFieldsWidth()
     // default: all fields have the same width
     int nWidth = nWindowWidth / m_nFields;
     for ( int i = 0; i < m_nFields; i++ )
     // default: all fields have the same width
     int nWidth = nWindowWidth / m_nFields;
     for ( int i = 0; i < m_nFields; i++ )

-      pWidths[i] = (i + 1) * nWindowWidth;
+      pWidths[i] = (i + 1) * nWidth;

   }
   else {
     // -1 doesn't mean the same thing for wxWindows and Win32, recalc
   }
   else {
     // -1 doesn't mean the same thing for wxWindows and Win32, recalc


@@ -196,7 +191,7 @@ void wxStatusBar95::SetFieldsWidth()
   }
 
   if ( !StatusBar_SetParts(hwnd, m_nFields, pWidths) ) {
   }
 
   if ( !StatusBar_SetParts(hwnd, m_nFields, pWidths) ) {

-    wxLogDebug("StatusBar_SetParts failed.");
+    wxLogDebug(_T("StatusBar_SetParts failed."));

   }
 
   delete [] pWidths;
   }
 
   delete [] pWidths;


@@ -205,7 +200,7 @@ void wxStatusBar95::SetFieldsWidth()
 void wxStatusBar95::SetStatusText(const wxString& strText, int nField)
 {
   if ( !StatusBar_SetText(hwnd, nField, strText) ) {
 void wxStatusBar95::SetStatusText(const wxString& strText, int nField)
 {
   if ( !StatusBar_SetText(hwnd, nField, strText) ) {

-    wxLogDebug("StatusBar_SetText failed");
+    wxLogDebug(_T("StatusBar_SetText failed"));

   }
 }
 
   }
 }
 


@@ -213,11 +208,12 @@ wxString wxStatusBar95::GetStatusText(int nField) const
 {
   wxASSERT( (nField > -1) && (nField < m_nFields) );
 
 {
   wxASSERT( (nField > -1) && (nField < m_nFields) );
 

-  wxString str("");
+  wxString str(_T(""));

   int len = StatusBar_GetTextLen(hwnd, nField);
   if (len > 0)
   {
         StatusBar_GetText(hwnd, nField, str.GetWriteBuf(len));
   int len = StatusBar_GetTextLen(hwnd, nField);
   if (len > 0)
   {
         StatusBar_GetText(hwnd, nField, str.GetWriteBuf(len));

+        str.UngetWriteBuf();

   }
   return str;
 }
   }
   return str;
 }


@@ -231,4 +227,9 @@ void wxStatusBar95::OnSize(wxSizeEvent& event)
   SetFieldsWidth();
 }
 
   SetFieldsWidth();
 }
 

-#endif  //USE_NATIVE_STATUSBAR
\ No newline at end of file
+#endif  // wxUSE_NATIVE_STATUSBAR
+
+#else
+    #error "wxStatusBar95 is only available under Windows 95 and later."
+#endif // __WIN95__
+