compilation fixes - wxGTK compiles but not links

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

diff --git a/src/msw/statbr95.cpp b/src/msw/statbr95.cpp
index 6f02d0aa5782848633302d5b063207eb0fbf6d68..df3eacee72badff1c160c47284a32273ede4d1e2 100644 (file)
--- a/src/msw/statbr95.cpp
+++ b/src/msw/statbr95.cpp
@@ -2,20 +2,16 @@
 // Name:        msw/statbr95.cpp
 // Purpose:     native implementation of wxStatusBar
 // Author:      Vadim Zeitlin
 // Name:        msw/statbr95.cpp
 // Purpose:     native implementation of wxStatusBar
 // Author:      Vadim Zeitlin

-// Modified by: 
+// Modified by:

 // Created:     04.04.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows license
 ///////////////////////////////////////////////////////////////////////////////
 
 // Created:     04.04.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows license
 ///////////////////////////////////////////////////////////////////////////////
 

-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
+#ifdef __GNUG__
+#pragma implementation "statbr95.h"
+#endif

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


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

-#include "wx/log.h"
+#if defined(__WIN95__) && wxUSE_NATIVE_STATUSBAR

 
 

-#include "wx/generic/statusbr.h"
-#include "wx/msw/statbr95.h"
+#include "wx/intl.h"
+#include "wx/log.h"
+#include "wx/statusbr.h"

 
 

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

 
 

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

 #endif
 
 #endif
 

-#if     USE_NATIVE_STATUSBAR
-
-#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
+// ----------------------------------------------------------------------------
+// wxWindows macros
+// ----------------------------------------------------------------------------

 
 

+IMPLEMENT_DYNAMIC_CLASS(wxStatusBar95, wxWindow);
+IMPLEMENT_DYNAMIC_CLASS(wxStatusBar, wxStatusBar95)

 
 // ----------------------------------------------------------------------------
 // macros
 
 // ----------------------------------------------------------------------------
 // macros


@@ -61,11 +53,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 hwnd      ((HWND)m_hWnd)
+#define StatusBar_GetText(h, n, s)  LOWORD(SendMessage(h, SB_GETTEXT, (WPARAM)n, (LPARAM)(LPTSTR)s))

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -77,151 +67,249 @@
 
 wxStatusBar95::wxStatusBar95()
 {
 
 wxStatusBar95::wxStatusBar95()
 {

-  SetParent(NULL);
-  m_hWnd = 0;
-  m_windowId = 0;
+    SetParent(NULL);
+    m_hWnd = 0;
+    m_windowId = 0;

 }
 
 }
 

-wxStatusBar95::wxStatusBar95(wxWindow *parent, wxWindowID id, long style)
+bool wxStatusBar95::Create(wxWindow *parent,
+                           wxWindowID id,
+                           long style,
+                           const wxString& name)

 {
 {

-  Create(parent, id, style);
-}
+    wxCHECK_MSG( parent, FALSE, wxT("status bar must have a parent") );

 
 

-bool wxStatusBar95::Create(wxWindow *parent, wxWindowID id, long style)
-{
-  SetParent(parent);
+    SetName(name);
+    SetWindowStyleFlag(style);
+    SetParent(parent);
+
+    parent->AddChild(this);
+
+    m_windowId = id == -1 ? NewControlId() : id;
+
+    DWORD wstyle = WS_CHILD | WS_VISIBLE;

 
 

-  m_windowId = id == -1 ? NewControlId() : id;
+    if ( style & wxCLIP_SIBLINGS )
+        wstyle |= WS_CLIPSIBLINGS;
+
+    // setting SBARS_SIZEGRIP is perfectly useless: it's always on by default
+    // (at least in the version of comctl32.dll I'm using), and the only way to
+    // turn it off is to use CCS_TOP style - as we position the status bar
+    // manually anyhow (see DoMoveWindow), use CCS_TOP style if wxST_SIZEGRIP
+    // is not given
+    if ( !(style & wxST_SIZEGRIP) )
+    {
+        wstyle |= CCS_TOP;
+    }
+    else
+    {
+        // may be some versions of comctl32.dll do need it - anyhow, it won't
+        // do any harm
+        wstyle |= SBARS_SIZEGRIP;
+    }

 
 

-  DWORD wstyle = WS_CHILD | WS_VISIBLE;
-  if ( style & wxST_SIZEGRIP )
-    wstyle |= SBARS_SIZEGRIP;
+    m_hWnd = (WXHWND)CreateStatusWindow(wstyle,
+                                        wxEmptyString,
+                                        GetHwndOf(parent),
+                                        m_windowId);
+    if ( m_hWnd == 0 )
+    {
+        wxLogSysError(_("Failed to create a status bar."));

 
 

-  m_hWnd = (WXHWND)CreateStatusWindow(wstyle,
-                                      "",
-                                      (HWND)parent->GetHWND(),
-                                      m_windowId);
-  if ( m_hWnd == 0 ) {
-    wxLogSysError("can't create status bar window");
-    return FALSE;
-  }
+        return FALSE;
+    }

 
 

-  // this doesn't work: display problems (white 1-2 pixel borders...)
-  //  SubclassWin(m_hWnd);
+    SetFieldsCount(1);
+    SubclassWin(m_hWnd);

 
 

-  return TRUE;
+    return TRUE;

 }
 
 }
 

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

 {
 {

-  if (widths && !m_statusWidths)
-    m_statusWidths = new int[m_nFields];
-
-  if ( widths != NULL ) {
-    for ( int i = 0; i < m_nFields; i++ )
-      m_statusWidths[i] = widths[i];
-  }
-  else {

     delete [] m_statusWidths;
     delete [] m_statusWidths;

-    m_statusWidths = NULL;
-  }
+}
+
+void wxStatusBar95::CopyFieldsWidth(const int widths[])
+{
+    if (widths && !m_statusWidths)
+        m_statusWidths = new int[m_nFields];
+
+    if ( widths != NULL )
+    {
+        for ( int i = 0; i < m_nFields; i++ )
+            m_statusWidths[i] = widths[i];
+    }
+    else // no widths
+    {
+        delete [] m_statusWidths;
+        m_statusWidths = NULL;
+    }

 }
 
 void wxStatusBar95::SetFieldsCount(int nFields, const int *widths)
 {
 }
 
 void wxStatusBar95::SetFieldsCount(int nFields, const int *widths)
 {

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

 
 

-  m_nFields = nFields;
+    m_nFields = nFields;

 
 

-  CopyFieldsWidth(widths);
-  SetFieldsWidth();
+    CopyFieldsWidth(widths);
+    SetFieldsWidth();

 }
 
 }
 

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

 {
 {

-  // @@ I don't understand what this function is for...
-  wxASSERT( n == m_nFields );
+    wxASSERT_MSG( n == m_nFields, _T("field number mismatch") );

 
 

-  CopyFieldsWidth(widths);
-  SetFieldsWidth();
+    CopyFieldsWidth(widths);
+    SetFieldsWidth();

 }
 
 void wxStatusBar95::SetFieldsWidth()
 {
 }
 
 void wxStatusBar95::SetFieldsWidth()
 {

-  int *pWidths = new int[m_nFields];
-
-  int nWindowWidth, y;
-  GetClientSize(&nWindowWidth, &y);
-
-  if ( m_statusWidths == NULL ) {
-    // 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;
-  }
-  else {
-    // -1 doesn't mean the same thing for wxWindows and Win32, recalc
-    int nTotalWidth = 0, 
-        nVarCount = 0, 
+    if ( !m_nFields )
+        return;
+
+    int aBorders[3];
+    SendMessage(GetHwnd(), SB_GETBORDERS, 0, (LPARAM)aBorders);
+
+    int extraWidth = aBorders[2]; // space between fields
+
+    int *pWidths = new int[m_nFields];
+
+    int nWindowWidth, y;
+    GetClientSize(&nWindowWidth, &y);
+
+    if ( m_statusWidths == NULL ) {
+        // default: all fields have the same width
+        int nWidth = nWindowWidth / m_nFields;
+        for ( int i = 0; i < m_nFields; i++ )
+            pWidths[i] = (i + 1) * nWidth;
+    }
+    else {
+        // -1 doesn't mean the same thing for wxWindows and Win32, recalc
+        int nTotalWidth = 0,
+        nVarCount = 0,

         i;
         i;

-    for ( i = 0; i < m_nFields; i++ ) {
-      if ( m_statusWidths[i] == -1 )
-        nVarCount++;
-      else
-        nTotalWidth += m_statusWidths[i];
+        for ( i = 0; i < m_nFields; i++ ) {
+            if ( m_statusWidths[i] == -1 )
+                nVarCount++;
+            else
+                nTotalWidth += m_statusWidths[i] + extraWidth;
+        }
+
+        if ( nVarCount == 0 ) {
+            wxFAIL_MSG( _T("at least one field must be of variable width") );
+
+            nVarCount++;
+        }
+
+        int nVarWidth = (nWindowWidth - nTotalWidth) / nVarCount;
+
+        // do fill the array
+        int nCurPos = 0;
+        for ( i = 0; i < m_nFields; i++ ) {
+            if ( m_statusWidths[i] == -1 )
+                nCurPos += nVarWidth;
+            else
+                nCurPos += m_statusWidths[i] + extraWidth;
+            pWidths[i] = nCurPos;
+        }

     }
 
     }
 

-    if ( nVarCount == 0 ) {
-      // wrong! at least one field must be of variable width
-      wxFAIL;
-
-      nVarCount++;
+    if ( !StatusBar_SetParts(GetHwnd(), m_nFields, pWidths) ) {
+        wxLogLastError(wxT("StatusBar_SetParts"));

     }
 
     }
 

-    int nVarWidth = (nWindowWidth - nTotalWidth) / nVarCount;
+    delete [] pWidths;
+}
+
+void wxStatusBar95::SetStatusText(const wxString& strText, int nField)
+{
+    wxCHECK_RET( (nField >= 0) && (nField < m_nFields),
+                 _T("invalid statusbar field index") );

 
 

-    // do fill the array
-    int nCurPos = 0;
-    for ( i = 0; i < m_nFields; i++ ) {
-      if ( m_statusWidths[i] == -1 )
-        nCurPos += nVarWidth;
-      else
-        nCurPos += m_statusWidths[i];
-      pWidths[i] = nCurPos;
+    if ( !StatusBar_SetText(GetHwnd(), nField, strText) )
+    {
+        wxLogLastError(wxT("StatusBar_SetText"));

     }
     }

-  }
+}

 
 

-  if ( !StatusBar_SetParts(hwnd, m_nFields, pWidths) ) {
-    wxLogDebug("StatusBar_SetParts failed.");
-  }
+wxString wxStatusBar95::GetStatusText(int nField) const
+{
+    wxCHECK_MSG( (nField >= 0) && (nField < m_nFields), wxEmptyString,
+                 _T("invalid statusbar field index") );
+
+    wxString str;
+    int len = StatusBar_GetTextLen(GetHwnd(), nField);
+    if ( len > 0 )
+    {
+        StatusBar_GetText(GetHwnd(), nField, str.GetWriteBuf(len));
+        str.UngetWriteBuf();
+    }

 
 

-  delete [] pWidths;
+    return str;

 }
 
 }
 

-void wxStatusBar95::SetStatusText(const wxString& strText, const int nField)
+int wxStatusBar95::GetBorderX() const

 {
 {

-  if ( !StatusBar_SetText(hwnd, nField, strText) ) {
-    wxLogDebug("StatusBar_SetText failed");
-  }
+    int aBorders[3];
+    SendMessage(GetHwnd(), SB_GETBORDERS, 0, (LPARAM)aBorders);
+
+    return aBorders[0];

 }
 
 }
 

-wxString wxStatusBar95::GetStatusText(int nField) const
+int wxStatusBar95::GetBorderY() const

 {
 {

-  wxASSERT( (nField > 0) && (nField < m_nFields) );
+    int aBorders[3];
+    SendMessage(GetHwnd(), SB_GETBORDERS, 0, (LPARAM)aBorders);

 
 

-  wxString str;
-  StatusBar_GetText(hwnd, nField, 
-                    str.GetWriteBuf(StatusBar_GetTextLen(hwnd, nField)));
-  return str;
+    return aBorders[1];

 }
 
 }
 

-void wxStatusBar95::OnSize(wxSizeEvent& event)
+void wxStatusBar95::SetMinHeight(int height)

 {
 {

-  FORWARD_WM_SIZE(hwnd, SIZE_RESTORED, event.GetSize().x, event.GetSize().y,
-                  SendMessage);
+    SendMessage(GetHwnd(), SB_SETMINHEIGHT, height + 2*GetBorderY(), 0);

 
 

-  // adjust fields widths to the new size
-  SetFieldsWidth();
+    // have to send a (dummy) WM_SIZE to redraw it now
+    SendMessage(GetHwnd(), WM_SIZE, 0, 0);

 }
 
 }
 

-#endif  //USE_NATIVE_STATUSBAR
\ No newline at end of file
+bool wxStatusBar95::GetFieldRect(int i, wxRect& rect) const
+{
+    wxCHECK_MSG( (i >= 0) && (i < m_nFields), FALSE,
+                 _T("invalid statusbar field index") );
+
+    RECT r;
+    if ( !::SendMessage(GetHwnd(), SB_GETRECT, i, (LPARAM)&r) )
+    {
+        wxLogLastError(wxT("SendMessage(SB_GETRECT)"));
+    }
+
+    wxCopyRECTToRect(r, rect);
+
+    return TRUE;
+}
+
+void wxStatusBar95::DoMoveWindow(int x, int y, int width, int height)
+{
+    // the status bar wnd proc must be forwarded the WM_SIZE message whenever
+    // the stat bar position/size is changed because it normally positions the
+    // control itself along bottom or top side of the parent window - failing
+    // to do so will result in nasty visual effects
+    FORWARD_WM_SIZE(GetHwnd(), SIZE_RESTORED, x, y, SendMessage);
+
+    // but now, when the standard status bar wnd proc did all it wanted to do,
+    // move the status bar to its correct location - usually this call may be
+    // omitted because for normal status bars (positioned along the bottom
+    // edge) the position is already set correctly, but if the user wants to
+    // position them in some exotic location, this is really needed
+    wxWindow::DoMoveWindow(x, y, width, height);
+
+    // adjust fields widths to the new size
+    SetFieldsWidth();
+}
+
+#endif // __WIN95__ && wxUSE_NATIVE_STATUSBAR
+