Misc fixes, now menus are almost working on MicroWindows

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

diff --git a/src/msw/button.cpp b/src/msw/button.cpp
index a7df197b6c67f450d83bb11d7e2f4981ddf48300..1915ad36fab67a1a66d78f84f44c254dcb6fb133 100644 (file)
--- a/src/msw/button.cpp
+++ b/src/msw/button.cpp
@@ -28,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"


@@ -74,13 +76,28 @@ bool wxButton::Create(wxWindow *parent,
     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),
                       wxT("BUTTON"),
                       label,
 
     m_hWnd = (WXHWND)CreateWindowEx
                      (
                       MakeExtendedStyle(m_windowStyle),
                       wxT("BUTTON"),
                       label,

-                      WS_VISIBLE | WS_TABSTOP | WS_CHILD,
+                      msStyle,

                       0, 0, 0, 0,
                       GetWinHwnd(parent),
                       (HMENU)m_windowId,
                       0, 0, 0, 0,
                       GetWinHwnd(parent),
                       (HMENU)m_windowId,


@@ -88,6 +105,17 @@ bool wxButton::Create(wxWindow *parent,
                       NULL
                      );
 
                       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);
 


@@ -95,19 +123,6 @@ bool wxButton::Create(wxWindow *parent,
 
     SetSize(pos.x, pos.y, size.x, size.y);
 
 
     SetSize(pos.x, pos.y, size.x, size.y);
 

-    // bad hack added by Robert to make buttons at least
-    // 80 pixels wide. There are probably better ways...
-    // TODO. FIXME.
-    wxSize nsize( GetSize() );
-    if ((nsize.x < 80) || (nsize.y < 23))
-    {
-        if ((size.x == -1) && (nsize.x < 80))
-            nsize.x = 80;
-        if ((size.y == -1) && (nsize.y < 23))
-            nsize.y = 23;
-        SetSize( nsize );
-    }
-

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -143,11 +158,15 @@ wxSize wxButton::DoGetBestSize() const
     // 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;
 


@@ -241,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: // means that the message came from an 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;
     }


@@ -265,6 +285,14 @@ long wxButton::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 
         // let the default processign take place too
     }
 
         // 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);
 
     // let the base class do all real processing
     return wxControl::MSWWindowProc(nMsg, wParam, lParam);


@@ -347,10 +375,11 @@ bool wxButton::SetForegroundColour(const wxColour &colour)
    The button frame looks like this normally:
 
    WWWWWWWWWWWWWWWWWWB
    The button frame looks like this normally:
 
    WWWWWWWWWWWWWWWWWWB

-   W                GB
-   W                GB
-   W                GB  where W, G, B are white, grey and black pixels
-   W                GB
+   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
 
    WGGGGGGGGGGGGGGGGGB
    BBBBBBBBBBBBBBBBBBB
 


@@ -359,8 +388,9 @@ bool wxButton::SetForegroundColour(const wxColour &colour)
 
    BBBBBBBBBBBBBBBBBBB
    BWWWWWWWWWWWWWWWWBB
 
    BBBBBBBBBBBBBBBBBBB
    BWWWWWWWWWWWWWWWWBB

-   BW              GBB
-   BW              GBB
+   BWHHHHHHHHHHHHHHGBB
+   BWH             GBB
+   BWH             GBB

    BWGGGGGGGGGGGGGGGBB
    BBBBBBBBBBBBBBBBBBB
    BBBBBBBBBBBBBBBBBBB
    BWGGGGGGGGGGGGGGGBB
    BBBBBBBBBBBBBBBBBBB
    BBBBBBBBBBBBBBBBBBB


@@ -372,6 +402,7 @@ bool wxButton::SetForegroundColour(const wxColour &colour)
    BG               GB
    BG               GB
    BG               GB
    BG               GB
    BG               GB
    BG               GB

+   BG               GB

    BGGGGGGGGGGGGGGGGGB
    BBBBBBBBBBBBBBBBBBB
 */
    BGGGGGGGGGGGGGGGGGB
    BBBBBBBBBBBBBBBBBBB
 */


@@ -382,9 +413,10 @@ static void DrawButtonFrame(HDC hdc, const RECT& rectBtn,
     RECT r;
     CopyRect(&r, &rectBtn);
 
     RECT r;
     CopyRect(&r, &rectBtn);
 

-    HPEN hpenBlack = CreatePen(PS_SOLID, 1, GetSysColor(COLOR_3DDKSHADOW)),
-         hpenGrey = CreatePen(PS_SOLID, 1, GetSysColor(COLOR_3DSHADOW)),
-         hpenWhite = CreatePen(PS_SOLID, 1, GetSysColor(COLOR_3DHILIGHT));
+    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);
 
 
     HPEN hpenOld = (HPEN)SelectObject(hdc, hpenBlack);
 


@@ -418,6 +450,11 @@ static void DrawButtonFrame(HDC hdc, const RECT& rectBtn,
         LineTo(hdc, r.left, r.top);
         LineTo(hdc, r.right, r.top);
 
         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);
         (void)SelectObject(hdc, hpenGrey);
         MoveToEx(hdc, r.left + 1, r.bottom - 1, NULL);
         LineTo(hdc, r.right - 1, r.bottom - 1);


@@ -426,6 +463,7 @@ static void DrawButtonFrame(HDC hdc, const RECT& rectBtn,
 
     (void)SelectObject(hdc, hpenOld);
     DeleteObject(hpenWhite);
 
     (void)SelectObject(hdc, hpenOld);
     DeleteObject(hpenWhite);

+    DeleteObject(hpenLightGr);

     DeleteObject(hpenGrey);
     DeleteObject(hpenBlack);
 }
     DeleteObject(hpenGrey);
     DeleteObject(hpenBlack);
 }


@@ -491,3 +529,6 @@ bool wxButton::MSWOnDraw(WXDRAWITEMSTRUCT *wxdis)
 }
 
 #endif // __WIN32__
 }
 
 #endif // __WIN32__

+
+#endif // wxUSE_BUTTON
+