menu bar wasn't set properly internally after my previous change - fixed

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

diff --git a/src/msw/button.cpp b/src/msw/button.cpp
index 9a8122e0791fd2e621c4ff9a5beb50366f24ec8e..1915ad36fab67a1a66d78f84f44c254dcb6fb133 100644 (file)
--- a/src/msw/button.cpp
+++ b/src/msw/button.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        button.cpp
+// Name:        msw/button.cpp

 // Purpose:     wxButton
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxButton
 // Author:      Julian Smart
 // Modified by:


@@ -16,6 +16,7 @@
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------

+

 #ifdef __GNUG__
     #pragma implementation "button.h"
 #endif
 #ifdef __GNUG__
     #pragma implementation "button.h"
 #endif


@@ -27,6 +28,8 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_BUTTON
+

 #ifndef WX_PRECOMP
     #include "wx/button.h"
     #include "wx/brush.h"
 #ifndef WX_PRECOMP
     #include "wx/button.h"
     #include "wx/brush.h"


@@ -42,9 +45,7 @@
 // macros
 // ----------------------------------------------------------------------------
 
 // macros
 // ----------------------------------------------------------------------------
 

-#if !USE_SHARED_LIBRARY
-    IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
-#endif
+IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)

 
 // this macro tries to adjust the default button height to a reasonable value
 // using the char height as the base
 
 // this macro tries to adjust the default button height to a reasonable value
 // using the char height as the base


@@ -70,26 +71,51 @@ bool wxButton::Create(wxWindow *parent,
     if ( !CreateBase(parent, id, pos, size, style, validator, name) )
         return FALSE;
 
     if ( !CreateBase(parent, id, pos, size, style, validator, name) )
         return FALSE;
 

-    SetValidator(validator);
-

     parent->AddChild((wxButton *)this);
 
     parent->AddChild((wxButton *)this);
 

-    m_backgroundColour = parent->GetBackgroundColour() ;
-    m_foregroundColour = parent->GetForegroundColour() ;
+    m_backgroundColour = parent->GetBackgroundColour();
+    m_foregroundColour = parent->GetForegroundColour();
+
+    long msStyle = WS_VISIBLE | WS_TABSTOP | WS_CHILD /* | WS_CLIPSIBLINGS */ ;
+
+    if ( m_windowStyle & wxCLIP_SIBLINGS )
+        msStyle |= WS_CLIPSIBLINGS;
+
+#ifdef __WIN32__
+    if(m_windowStyle & wxBU_LEFT)
+        msStyle |= BS_LEFT;
+    if(m_windowStyle & wxBU_RIGHT)
+        msStyle |= BS_RIGHT;
+    if(m_windowStyle & wxBU_TOP)
+        msStyle |= BS_TOP;
+    if(m_windowStyle & wxBU_BOTTOM)
+        msStyle |= BS_BOTTOM;
+#endif

 
     m_hWnd = (WXHWND)CreateWindowEx
                      (
                       MakeExtendedStyle(m_windowStyle),
 
     m_hWnd = (WXHWND)CreateWindowEx
                      (
                       MakeExtendedStyle(m_windowStyle),

-                      _T("BUTTON"),
+                      wxT("BUTTON"),

                       label,
                       label,

-                      WS_VISIBLE | WS_TABSTOP | WS_CHILD,
-                      0, 0, 0, 0, 
+                      msStyle,
+                      0, 0, 0, 0,

                       GetWinHwnd(parent),
                       (HMENU)m_windowId,
                       wxGetInstance(),
                       NULL
                      );
 
                       GetWinHwnd(parent),
                       (HMENU)m_windowId,
                       wxGetInstance(),
                       NULL
                      );
 

+    if (m_hWnd == 0)
+    {
+        wxString msg;
+#ifdef __WIN16__
+        msg.Printf(wxT("CreateWindowEx failed"));
+#else
+        msg.Printf(wxT("CreateWindowEx failed with error number %ld"), (long) GetLastError());
+#endif
+        wxFAIL_MSG(msg);
+    }
+

     // Subclass again for purposes of dialog editing mode
     SubclassWin(m_hWnd);
 
     // Subclass again for purposes of dialog editing mode
     SubclassWin(m_hWnd);
 


@@ -117,7 +143,7 @@ wxButton::~wxButton()
 // size management including autosizing
 // ----------------------------------------------------------------------------
 
 // size management including autosizing
 // ----------------------------------------------------------------------------
 

-wxSize wxButton::DoGetBestSize()
+wxSize wxButton::DoGetBestSize() const

 {
     wxString label = wxGetWindowText(GetHWND());
     int wBtn;
 {
     wxString label = wxGetWindowText(GetHWND());
     int wBtn;


@@ -132,11 +158,15 @@ wxSize wxButton::DoGetBestSize()
     // the button height is proportional to the height of the font used
     int hBtn = BUTTON_HEIGHT_FROM_CHAR_HEIGHT(hChar);
 
     // the button height is proportional to the height of the font used
     int hBtn = BUTTON_HEIGHT_FROM_CHAR_HEIGHT(hChar);
 

-    return wxSize(wBtn, hBtn);
+    wxSize sz = GetDefaultSize();
+    if (wBtn > sz.x) sz.x = wBtn;
+    if (hBtn > sz.y) sz.y = hBtn;
+
+    return sz;

 }
 
 /* static */
 }
 
 /* static */

-wxSize wxButton::GetDefaultSize()
+wxSize wxButtonBase::GetDefaultSize()

 {
     static wxSize s_sizeBtn;
 
 {
     static wxSize s_sizeBtn;
 


@@ -180,20 +210,33 @@ void wxButton::SetDefault()
         SendMessage(GetWinHwnd(parent), DM_SETDEFID, m_windowId, 0L);
     }
 
         SendMessage(GetWinHwnd(parent), DM_SETDEFID, m_windowId, 0L);
     }
 

-    // this doesn't work with bitmap buttons because it also removes the
-    // "ownerdrawn" style...
-    if ( btnOldDefault && !wxDynamicCast(btnOldDefault, wxBitmapButton) )
+    if ( btnOldDefault )

     {
         // remove the BS_DEFPUSHBUTTON style from the other button
         long style = GetWindowLong(GetHwndOf(btnOldDefault), GWL_STYLE);
     {
         // remove the BS_DEFPUSHBUTTON style from the other button
         long style = GetWindowLong(GetHwndOf(btnOldDefault), GWL_STYLE);

-        style &= ~BS_DEFPUSHBUTTON;
-        SendMessage(GetHwndOf(btnOldDefault), BM_SETSTYLE, style, 1L);
+
+        // don't do it with the owner drawn buttons because it will reset
+        // BS_OWNERDRAW style bit too (BS_OWNERDRAW & BS_DEFPUSHBUTTON != 0)!
+        if ( (style & BS_OWNERDRAW) != BS_OWNERDRAW )
+        {
+            style &= ~BS_DEFPUSHBUTTON;
+            SendMessage(GetHwndOf(btnOldDefault), BM_SETSTYLE, style, 1L);
+        }
+        else
+        {
+            // redraw the button - it will notice itself that it's not the
+            // default one any longer
+            btnOldDefault->Refresh();
+        }

     }
 
     // set this button as the default
     long style = GetWindowLong(GetHwnd(), GWL_STYLE);
     }
 
     // set this button as the default
     long style = GetWindowLong(GetHwnd(), GWL_STYLE);

-    style |= BS_DEFPUSHBUTTON;
-    SendMessage(GetHwnd(), BM_SETSTYLE, style, 1L);
+    if ( (style & BS_OWNERDRAW) != BS_OWNERDRAW )
+    {
+        style |= BS_DEFPUSHBUTTON;
+        SendMessage(GetHwnd(), BM_SETSTYLE, style, 1L);
+    }

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -217,13 +260,14 @@ void wxButton::Command(wxCommandEvent & event)
 // event/message handlers
 // ----------------------------------------------------------------------------
 
 // event/message handlers
 // ----------------------------------------------------------------------------
 

-bool wxButton::MSWCommand(WXUINT param, WXWORD id)
+bool wxButton::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))

 {
     bool processed = FALSE;
     switch ( param )
     {
 {
     bool processed = FALSE;
     switch ( param )
     {

-        case 1:                                             // 1 for accelerator
-        case BN_CLICKED:
+        case 1:                     // message came from an accelerator
+        case BN_CLICKED:            // normal buttons send this
+        case BN_DOUBLECLICKED:      // owner-drawn ones also send this

             processed = SendClickEvent();
             break;
     }
             processed = SendClickEvent();
             break;
     }


@@ -231,15 +275,260 @@ bool wxButton::MSWCommand(WXUINT param, WXWORD id)
     return processed;
 }
 
     return processed;
 }
 

-WXHBRUSH wxButton::OnCtlColor(WXHDC pDC,
-                              WXHWND pWnd,
-                              WXUINT nCtlColor,
-                              WXUINT message,
-                              WXWPARAM wParam,
-                              WXLPARAM lParam)
+long wxButton::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
+{
+    // when we receive focus, we want to become the default button in our
+    // parent panel
+    if ( nMsg == WM_SETFOCUS )
+    {
+        SetDefault();
+
+        // let the default processign take place too
+    }
+    else if ( nMsg == WM_LBUTTONDBLCLK )
+    {
+        // emulate a click event to force an owner-drawn button to change its
+        // appearance - without this, it won't do it
+        (void)wxControl::MSWWindowProc(WM_LBUTTONDOWN, wParam, lParam);
+
+        // and conitnue with processing the message normally as well
+    }
+
+    // let the base class do all real processing
+    return wxControl::MSWWindowProc(nMsg, wParam, lParam);
+}
+
+// ----------------------------------------------------------------------------
+// owner-drawn buttons support
+// ----------------------------------------------------------------------------
+
+#ifdef __WIN32__
+
+// drawing helpers
+
+static void DrawButtonText(HDC hdc,
+                           RECT *pRect,
+                           const wxString& text,
+                           COLORREF col)
+{
+    COLORREF colOld = SetTextColor(hdc, col);
+    int modeOld = SetBkMode(hdc, TRANSPARENT);
+
+    DrawText(hdc, text, text.length(), pRect,
+             DT_CENTER | DT_VCENTER | DT_SINGLELINE);
+
+    SetBkMode(hdc, modeOld);
+    SetTextColor(hdc, colOld);
+}
+
+static void DrawRect(HDC hdc, const RECT& r)
+{
+    MoveToEx(hdc, r.left, r.top, NULL);
+    LineTo(hdc, r.right, r.top);
+    LineTo(hdc, r.right, r.bottom);
+    LineTo(hdc, r.left, r.bottom);
+    LineTo(hdc, r.left, r.top);
+}
+
+void wxButton::MakeOwnerDrawn()
+{
+    long style = GetWindowLong(GetHwnd(), GWL_STYLE);
+    if ( (style & BS_OWNERDRAW) != BS_OWNERDRAW )
+    {
+        // make it so
+        style |= BS_OWNERDRAW;
+        SetWindowLong(GetHwnd(), GWL_STYLE, style);
+    }
+}
+
+bool wxButton::SetBackgroundColour(const wxColour &colour)
+{
+    if ( !wxControl::SetBackgroundColour(colour) )
+    {
+        // nothing to do
+        return FALSE;
+    }
+
+    MakeOwnerDrawn();
+
+    Refresh();
+
+    return TRUE;
+}
+
+bool wxButton::SetForegroundColour(const wxColour &colour)

 {
 {

-  wxBrush *backgroundBrush = wxTheBrushList->FindOrCreateBrush(GetBackgroundColour(), wxSOLID);
+    if ( !wxControl::SetForegroundColour(colour) )
+    {
+        // nothing to do
+        return FALSE;
+    }
+
+    MakeOwnerDrawn();
+
+    Refresh();
+
+    return TRUE;
+}
+
+/*
+   The button frame looks like this normally:
+
+   WWWWWWWWWWWWWWWWWWB
+   WHHHHHHHHHHHHHHHHGB  W = white       (HILIGHT)
+   WH               GB  H = light grey  (LIGHT)
+   WH               GB  G = dark grey   (SHADOW)
+   WH               GB  B = black       (DKSHADOW)
+   WH               GB
+   WGGGGGGGGGGGGGGGGGB
+   BBBBBBBBBBBBBBBBBBB
+
+   When the button is selected, the button becomes like this (the total button
+   size doesn't change):
+
+   BBBBBBBBBBBBBBBBBBB
+   BWWWWWWWWWWWWWWWWBB
+   BWHHHHHHHHHHHHHHGBB
+   BWH             GBB
+   BWH             GBB
+   BWGGGGGGGGGGGGGGGBB
+   BBBBBBBBBBBBBBBBBBB
+   BBBBBBBBBBBBBBBBBBB
+
+   When the button is pushed (while selected) it is like:
+
+   BBBBBBBBBBBBBBBBBBB
+   BGGGGGGGGGGGGGGGGGB
+   BG               GB
+   BG               GB
+   BG               GB
+   BG               GB
+   BGGGGGGGGGGGGGGGGGB
+   BBBBBBBBBBBBBBBBBBB
+*/
+
+static void DrawButtonFrame(HDC hdc, const RECT& rectBtn,
+                            bool selected, bool pushed)
+{
+    RECT r;
+    CopyRect(&r, &rectBtn);
+
+    HPEN hpenBlack   = CreatePen(PS_SOLID, 1, GetSysColor(COLOR_3DDKSHADOW)),
+         hpenGrey    = CreatePen(PS_SOLID, 1, GetSysColor(COLOR_3DSHADOW)),
+         hpenLightGr = CreatePen(PS_SOLID, 1, GetSysColor(COLOR_3DLIGHT)),
+         hpenWhite   = CreatePen(PS_SOLID, 1, GetSysColor(COLOR_3DHILIGHT));
+
+    HPEN hpenOld = (HPEN)SelectObject(hdc, hpenBlack);
+
+    r.right--;
+    r.bottom--;
+
+    if ( pushed )
+    {
+        DrawRect(hdc, r);
+
+        (void)SelectObject(hdc, hpenGrey);
+        InflateRect(&r, -1, -1);
+
+        DrawRect(hdc, r);
+    }
+    else // !pushed
+    {
+        if ( selected )
+        {
+            DrawRect(hdc, r);
+
+            InflateRect(&r, -1, -1);
+        }
+
+        MoveToEx(hdc, r.left, r.bottom, NULL);
+        LineTo(hdc, r.right, r.bottom);
+        LineTo(hdc, r.right, r.top - 1);
+
+        (void)SelectObject(hdc, hpenWhite);
+        MoveToEx(hdc, r.left, r.bottom - 1, NULL);
+        LineTo(hdc, r.left, r.top);
+        LineTo(hdc, r.right, r.top);
+
+        (void)SelectObject(hdc, hpenLightGr);
+        MoveToEx(hdc, r.left + 1, r.bottom - 2, NULL);
+        LineTo(hdc, r.left + 1, r.top + 1);
+        LineTo(hdc, r.right - 1, r.top + 1);
+
+        (void)SelectObject(hdc, hpenGrey);
+        MoveToEx(hdc, r.left + 1, r.bottom - 1, NULL);
+        LineTo(hdc, r.right - 1, r.bottom - 1);
+        LineTo(hdc, r.right - 1, r.top);
+    }

 
 

-  return (WXHBRUSH) backgroundBrush->GetResourceHandle();
+    (void)SelectObject(hdc, hpenOld);
+    DeleteObject(hpenWhite);
+    DeleteObject(hpenLightGr);
+    DeleteObject(hpenGrey);
+    DeleteObject(hpenBlack);

 }
 
 }
 

+bool wxButton::MSWOnDraw(WXDRAWITEMSTRUCT *wxdis)
+{
+    LPDRAWITEMSTRUCT lpDIS = (LPDRAWITEMSTRUCT)wxdis;
+
+    RECT rectBtn;
+    CopyRect(&rectBtn, &lpDIS->rcItem);
+
+    COLORREF colBg = wxColourToRGB(GetBackgroundColour()),
+             colFg = wxColourToRGB(GetForegroundColour());
+
+    HDC hdc = lpDIS->hDC;
+    UINT state = lpDIS->itemState;
+
+    // first, draw the background
+    HBRUSH hbrushBackground = ::CreateSolidBrush(colBg);
+
+    FillRect(hdc, &rectBtn, hbrushBackground);
+
+    // draw the border for the current state
+    bool selected = (state & ODS_SELECTED) != 0;
+    if ( !selected )
+    {
+        wxPanel *panel = wxDynamicCast(GetParent(), wxPanel);
+        if ( panel )
+        {
+            selected = panel->GetDefaultItem() == this;
+        }
+    }
+    bool pushed = (SendMessage(GetHwnd(), BM_GETSTATE, 0, 0) & BST_PUSHED) != 0;
+
+    DrawButtonFrame(hdc, rectBtn, selected, pushed);
+
+    // draw the focus rect if needed
+    if ( state & ODS_FOCUS )
+    {
+        RECT rectFocus;
+        CopyRect(&rectFocus, &rectBtn);
+
+        // I don't know where does this constant come from, but this is how
+        // Windows draws them
+        InflateRect(&rectFocus, -4, -4);
+
+        DrawFocusRect(hdc, &rectFocus);
+    }
+
+    if ( pushed )
+    {
+        // the label is shifted by 1 pixel to create "pushed" effect
+        OffsetRect(&rectBtn, 1, 1);
+    }
+
+    DrawButtonText(hdc, &rectBtn, GetLabel(),
+                   state & ODS_DISABLED ? GetSysColor(COLOR_GRAYTEXT)
+                                        : colFg);
+
+    ::DeleteObject(hbrushBackground);
+
+    return TRUE;
+}
+
+#endif // __WIN32__
+
+#endif // wxUSE_BUTTON
+