Various changes to make pop up menus work

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

diff --git a/src/msw/control.cpp b/src/msw/control.cpp
index 652b4929f78316da326e1e9bea2e7541d06ac083..930d7542ce8ff106fbfb3ad4a5afffed908ee7f7 100644 (file)
--- a/src/msw/control.cpp
+++ b/src/msw/control.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxControl class
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxControl class
 // Author:      Julian Smart
 // Modified by:


@@ -10,44 +10,42 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__

-#pragma implementation "control.h"
+    #pragma implementation "control.h"

 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

+#if wxUSE_CONTROLS
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-#include "wx/event.h"
-#include "wx/app.h"
-#include "wx/dcclient.h"
+    #include "wx/event.h"
+    #include "wx/app.h"
+    #include "wx/dcclient.h"
+    #include "wx/log.h"

 #endif
 
 #include "wx/control.h"
 
 #include "wx/msw/private.h"
 
 #endif
 
 #include "wx/control.h"
 
 #include "wx/msw/private.h"
 

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

 #endif
 
 #endif
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
 
 BEGIN_EVENT_TABLE(wxControl, wxWindow)
     EVT_ERASE_BACKGROUND(wxControl::OnEraseBackground)
 END_EVENT_TABLE()
 IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
 
 BEGIN_EVENT_TABLE(wxControl, wxWindow)
     EVT_ERASE_BACKGROUND(wxControl::OnEraseBackground)
 END_EVENT_TABLE()

-#endif

 
 // Item members
 wxControl::wxControl()
 {
 
 // Item members
 wxControl::wxControl()
 {

-    m_backgroundColour = *wxWHITE;
-    m_foregroundColour = *wxBLACK;
-

 #if WXWIN_COMPATIBILITY
     m_callback = 0;
 #endif // WXWIN_COMPATIBILITY
 #if WXWIN_COMPATIBILITY
     m_callback = 0;
 #endif // WXWIN_COMPATIBILITY


@@ -58,23 +56,72 @@ wxControl::~wxControl()
     m_isBeingDeleted = TRUE;
 }
 
     m_isBeingDeleted = TRUE;
 }
 

-bool wxControl::MSWCreateControl(const wxChar *classname, WXDWORD style)
+
+bool wxControl::Create(wxWindow *parent,
+                       wxWindowID id,
+                       const wxPoint& pos,
+                       const wxSize& size,
+                       long style,
+                       const wxValidator& validator,
+                       const wxString& name)

 {
 {

-    // VZ: if someone could put a comment here explaining what exactly this is
-    //     needed for, it would be nice...
-    bool want3D;
+    if ( !wxWindow::Create(parent, id, pos, size, style, name) )
+        return FALSE;

 
 

-    // all controls have these childs (wxWindows creates all controls visible
-    // by default)
+#if wxUSE_VALIDATORS
+    SetValidator(validator);
+#endif
+
+    return TRUE;
+}
+
+bool wxControl::MSWCreateControl(const wxChar *classname,
+                                 const wxString& label,
+                                 const wxPoint& pos,
+                                 const wxSize& size,
+                                 long style)
+{
+    WXDWORD exstyle;
+    WXDWORD msStyle = MSWGetStyle(style, &exstyle);
+
+    return MSWCreateControl(classname, msStyle, pos, size, label, exstyle);
+}
+
+bool wxControl::MSWCreateControl(const wxChar *classname,
+                                 WXDWORD style,
+                                 const wxPoint& pos,
+                                 const wxSize& size,
+                                 const wxString& label,
+                                 WXDWORD exstyle)
+{
+    // want3D tells us whether or not the style specified a 3D border.
+    // If so, under WIN16 we can use Ctl3D to give it an appropriate style.
+    // Sometimes want3D is used to indicate that the non-extended style should have
+    // WS_BORDER.
+    bool want3D = TRUE;
+
+    // if no extended style given, determine it ourselves
+    if ( exstyle == (WXDWORD)-1 )
+    {
+        exstyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D);
+    }
+
+    // all controls should have these styles (wxWindows creates all controls
+    // visible by default)

     style |= WS_CHILD | WS_VISIBLE;
 
     style |= WS_CHILD | WS_VISIBLE;
 

+    int x = pos.x == -1 ? 0 : pos.x,
+        y = pos.y == -1 ? 0 : pos.y,
+        w = size.x == -1 ? 0 : size.x,
+        h = size.y == -1 ? 0 : size.y;
+

     m_hWnd = (WXHWND)::CreateWindowEx
                        (
     m_hWnd = (WXHWND)::CreateWindowEx
                        (

-                        GetExStyle(style, &want3D), // extended style
+                        exstyle,            // extended style

                         classname,          // the kind of control to create
                         classname,          // the kind of control to create

-                        NULL,               // the window name
+                        label,              // the window name

                         style,              // the window style
                         style,              // the window style

-                        0, 0, 0, 0,         // the window position and size
+                        x, y, w, h,         // the window position and size

                         GetHwndOf(GetParent()),  // parent
                         (HMENU)GetId(),     // child id
                         wxGetInstance(),    // app instance
                         GetHwndOf(GetParent()),  // parent
                         (HMENU)GetId(),     // child id
                         wxGetInstance(),    // app instance


@@ -83,9 +130,8 @@ bool wxControl::MSWCreateControl(const wxChar *classname, WXDWORD style)
 
     if ( !m_hWnd )
     {
 
     if ( !m_hWnd )
     {

-#ifdef __WXDEBUG__
-        wxLogError(wxT("Failed to create a control of class '%s'"), classname);
-#endif // DEBUG
+        wxLogDebug(wxT("Failed to create a control of class '%s'"), classname);
+        wxFAIL_MSG(_T("something is very wrong"));

 
         return FALSE;
     }
 
         return FALSE;
     }


@@ -98,16 +144,22 @@ bool wxControl::MSWCreateControl(const wxChar *classname, WXDWORD style)
     }
 #endif // wxUSE_CTL3D
 
     }
 #endif // wxUSE_CTL3D
 

-    // subclass again for purposes of dialog editing mode
+    // install wxWindows window proc for this window

     SubclassWin(m_hWnd);
 
     // controls use the same font and colours as their parent dialog by default
     InheritAttributes();
 
     SubclassWin(m_hWnd);
 
     // controls use the same font and colours as their parent dialog by default
     InheritAttributes();
 

+    // set the size now if no initial size specified
+    if ( w == 0 || h == 0 )
+    {
+        SetBestSize(size);
+    }
+

     return TRUE;
 }
 
     return TRUE;
 }
 

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

 {
     return wxSize(DEFAULT_ITEM_WIDTH, DEFAULT_ITEM_HEIGHT);
 }
 {
     return wxSize(DEFAULT_ITEM_WIDTH, DEFAULT_ITEM_HEIGHT);
 }


@@ -117,7 +169,7 @@ bool wxControl::ProcessCommand(wxCommandEvent& event)
 #if WXWIN_COMPATIBILITY
     if ( m_callback )
     {
 #if WXWIN_COMPATIBILITY
     if ( m_callback )
     {

-        (void)(*m_callback)(this, event);
+        (void)(*m_callback)(*this, event);

 
         return TRUE;
     }
 
         return TRUE;
     }


@@ -132,10 +184,10 @@ bool wxControl::MSWOnNotify(int idCtrl,
                             WXLPARAM lParam,
                             WXLPARAM* result)
 {
                             WXLPARAM lParam,
                             WXLPARAM* result)
 {

-    wxCommandEvent event(wxEVT_NULL, m_windowId);

     wxEventType eventType = wxEVT_NULL;
     wxEventType eventType = wxEVT_NULL;

-    NMHDR *hdr1 = (NMHDR*) lParam;
-    switch ( hdr1->code )
+
+    NMHDR *hdr = (NMHDR*) lParam;
+    switch ( hdr->code )

     {
         case NM_CLICK:
             eventType = wxEVT_COMMAND_LEFT_CLICK;
     {
         case NM_CLICK:
             eventType = wxEVT_COMMAND_LEFT_CLICK;


@@ -169,6 +221,7 @@ bool wxControl::MSWOnNotify(int idCtrl,
             return wxWindow::MSWOnNotify(idCtrl, lParam, result);
     }
 
             return wxWindow::MSWOnNotify(idCtrl, lParam, result);
     }
 

+    wxCommandEvent event(wxEVT_NULL, m_windowId);

     event.SetEventType(eventType);
     event.SetEventObject(this);
 
     event.SetEventType(eventType);
     event.SetEventObject(this);
 


@@ -178,10 +231,9 @@ bool wxControl::MSWOnNotify(int idCtrl,
 
 void wxControl::OnEraseBackground(wxEraseEvent& event)
 {
 
 void wxControl::OnEraseBackground(wxEraseEvent& event)
 {

-    // In general, you don't want to erase the background of a control,
-    // or you'll get a flicker.
-    // TODO: move this 'null' function into each control that
-    // might flicker.
+    // notice that this 'dumb' implementation may cause flicker for some of the
+    // controls in which case they should intercept wxEraseEvent and process it
+    // themselves somehow

 
     RECT rect;
     ::GetClientRect(GetHwnd(), &rect);
 
     RECT rect;
     ::GetClientRect(GetHwnd(), &rect);


@@ -196,16 +248,52 @@ void wxControl::OnEraseBackground(wxEraseEvent& event)
     ::SetMapMode(hdc, mode);
 }
 
     ::SetMapMode(hdc, mode);
 }
 

-WXDWORD wxControl::GetExStyle(WXDWORD& style, bool *want3D) const
+WXHBRUSH wxControl::OnCtlColor(WXHDC pDC, WXHWND WXUNUSED(pWnd), WXUINT WXUNUSED(nCtlColor),
+#if wxUSE_CTL3D
+                               WXUINT message,
+                               WXWPARAM wParam,
+                               WXLPARAM lParam
+#else
+                               WXUINT WXUNUSED(message),
+                               WXWPARAM WXUNUSED(wParam),
+                               WXLPARAM WXUNUSED(lParam)
+#endif
+    )

 {
 {

-    WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, want3D);
+#if wxUSE_CTL3D
+    if ( m_useCtl3D )
+    {
+        HBRUSH hbrush = Ctl3dCtlColorEx(message, wParam, lParam);
+        return (WXHBRUSH) hbrush;
+    }
+#endif // wxUSE_CTL3D

 
 

-    // Even with extended styles, need to combine with WS_BORDER for them to
-    // look right.
-    if ( *want3D || wxStyleHasBorder(m_windowStyle) )
-        style |= WS_BORDER;
+    HDC hdc = (HDC)pDC;
+    if (GetParent()->GetTransparentBackground())
+        SetBkMode(hdc, TRANSPARENT);
+    else
+        SetBkMode(hdc, OPAQUE);
+
+    wxColour colBack = GetBackgroundColour();
+
+    ::SetBkColor(hdc, wxColourToRGB(colBack));
+    ::SetTextColor(hdc, wxColourToRGB(GetForegroundColour()));
+
+    wxBrush *brush = wxTheBrushList->FindOrCreateBrush(colBack, wxSOLID);
+
+    return (WXHBRUSH)brush->GetResourceHandle();
+}
+
+WXDWORD wxControl::MSWGetStyle(long style, WXDWORD *exstyle) const
+{
+    long msStyle = wxWindow::MSWGetStyle(style, exstyle);
+
+    if ( AcceptsFocus() )
+    {
+        msStyle |= WS_TABSTOP;
+    }

 
 

-    return exStyle;
+    return msStyle;

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


@@ -242,3 +330,4 @@ void wxFindMaxSize(WXHWND wnd, RECT *rect)
         rect->bottom = bottom;
 }
 
         rect->bottom = bottom;
 }
 

+#endif // wxUSE_CONTROLS