Watcom C++ fixup in tbar95.cpp; removed WXWIN_COMPATIBILITY for 'old' menu

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

diff --git a/src/msw/button.cpp b/src/msw/button.cpp
index 241f90a07e8f570ef0211f246fea2bc3ab64a35d..e369bf170dfe762c98730786a978ed77e7ab182a 100644 (file)
--- a/src/msw/button.cpp
+++ b/src/msw/button.cpp
@@ -70,9 +70,6 @@ bool wxButton::Create(wxWindow *parent,
     if ( !CreateBase(parent, id, pos, size, style, validator, name) )
         return FALSE;
 
-    // Validator was set in CreateBase
-    //SetValidator(validator);
-
     parent->AddChild((wxButton *)this);
 
     m_backgroundColour = parent->GetBackgroundColour() ;
@@ -81,7 +78,7 @@ bool wxButton::Create(wxWindow *parent,
     m_hWnd = (WXHWND)CreateWindowEx
                      (
                       MakeExtendedStyle(m_windowStyle),
-                      T("BUTTON"),
+                      wxT("BUTTON"),
                       label,
                       WS_VISIBLE | WS_TABSTOP | WS_CHILD,
                       0, 0, 0, 0,
@@ -104,8 +101,10 @@ bool wxButton::Create(wxWindow *parent,
     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;
+        if ((size.x == -1) && (nsize.x < 80))
+            nsize.x = 80;
+        if ((size.y == -1) && (nsize.y < 23))
+            nsize.y = 23;
         SetSize( nsize );
     }
 
@@ -234,7 +233,7 @@ bool wxButton::MSWCommand(WXUINT param, WXWORD id)
     bool processed = FALSE;
     switch ( param )
     {
-        case 1:                                             // 1 for accelerator
+        case 1: // means that the message came from an accelerator
         case BN_CLICKED:
             processed = SendClickEvent();
             break;
@@ -250,8 +249,44 @@ WXHBRUSH wxButton::OnCtlColor(WXHDC pDC,
                               WXWPARAM wParam,
                               WXLPARAM lParam)
 {
-  wxBrush *backgroundBrush = wxTheBrushList->FindOrCreateBrush(GetBackgroundColour(), wxSOLID);
+    const HDC& hdc = (HDC)pDC;
+
+    const wxColour& colBack = GetBackgroundColour();
+    ::SetBkColor(hdc, RGB(colBack.Red(), colBack.Green(), colBack.Blue()));
+
+    const wxColour& colFor = GetForegroundColour();
+    ::SetTextColor(hdc, RGB(colFor.Red(), colFor.Green(), colFor.Blue()));
 
-  return (WXHBRUSH) backgroundBrush->GetResourceHandle();
+    ::SetBkMode(hdc, OPAQUE);
+
+    wxBrush *backgroundBrush = wxTheBrushList->FindOrCreateBrush(colBack,
+                                                                 wxSOLID);
+    backgroundBrush->RealizeResource();
+    return (WXHBRUSH)backgroundBrush->GetResourceHandle();
 }
 
+long wxButton::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
+{
+    // make sure that we won't have BS_DEFPUSHBUTTON style any more if the
+    // focus is being transfered to another button with the same parent -
+    // otherwise, we could finish with 2 default buttons inside one panel
+    if ( (nMsg == WM_KILLFOCUS) &&
+         (GetWindowLong(GetHwnd(), GWL_STYLE) & BS_DEFPUSHBUTTON) )
+    {
+        wxWindow *parent = GetParent();
+        wxWindow *win = wxFindWinFromHandle((WXHWND)wParam);
+        if ( win && win->GetParent() == parent )
+        {
+            wxPanel *panel = wxDynamicCast(parent, wxPanel);
+            if ( panel )
+            {
+                panel->SetDefaultItem(this);
+            }
+            // else: I don't know what to do - we'll still have the problem
+            //       with multiple default buttons in a dialog...
+        }
+    }
+
+    // let the base class do all real processing
+    return wxControl::MSWWindowProc(nMsg, wParam, lParam);
+}