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 21c9567042dced4a5116814e7cab1372b635798c..930d7542ce8ff106fbfb3ad4a5afffed908ee7f7 100644 (file)
--- a/src/msw/control.cpp
+++ b/src/msw/control.cpp
@@ -1,372 +1,333 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxControl class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
 // Purpose:     wxControl class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #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/app.h"
-#include "wx/dcclient.h"
+    #include "wx/event.h"
+    #include "wx/app.h"
+    #include "wx/dcclient.h"
+    #include "wx/log.h"

 #endif
 
 #endif
 

-#include "wx/msw/private.h"
+#include "wx/control.h"

 
 

-#if defined(__WIN95__) && !defined(__GNUWIN32__)
-#include <commctrl.h>
-#endif
+#include "wx/msw/private.h"

 
 

-#ifdef GetCharWidth
-#undef GetCharWidth
-#undef GetWindowProc
+#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)
 IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
 
 BEGIN_EVENT_TABLE(wxControl, wxWindow)

-       EVT_ERASE_BACKGROUND(wxControl::OnEraseBackground)
+    EVT_ERASE_BACKGROUND(wxControl::OnEraseBackground)

 END_EVENT_TABLE()
 END_EVENT_TABLE()

-#endif

 
 // Item members
 
 // Item members

-wxControl::wxControl(void)
+wxControl::wxControl()

 {
 {

-  m_backgroundColour = *wxWHITE;
-  m_foregroundColour = *wxBLACK;
-  m_callback = 0;
+#if WXWIN_COMPATIBILITY
+    m_callback = 0;
+#endif // WXWIN_COMPATIBILITY

 }
 
 }
 

-wxControl::~wxControl(void)
+wxControl::~wxControl()

 {
 {

-  m_isBeingDeleted = TRUE;
-
-  // If we delete an item, we should initialize the parent panel,
-  // because it could now be invalid.
-  wxWindow *parent = (wxWindow *)GetParent();
-  if (parent)
-  {
-    if (parent->GetDefaultItem() == this)
-        parent->SetDefaultItem(NULL);
-  }
+    m_isBeingDeleted = TRUE;

 }
 
 }
 

-void wxControl::SetLabel(const wxString& label)
+
+bool wxControl::Create(wxWindow *parent,
+                       wxWindowID id,
+                       const wxPoint& pos,
+                       const wxSize& size,
+                       long style,
+                       const wxValidator& validator,
+                       const wxString& name)

 {
 {

-  if (GetHWND())
-    SetWindowText((HWND) GetHWND(), (const char *)label);
+    if ( !wxWindow::Create(parent, id, pos, size, style, name) )
+        return FALSE;
+
+#if wxUSE_VALIDATORS
+    SetValidator(validator);
+#endif
+
+    return TRUE;

 }
 
 }
 

-wxString wxControl::GetLabel(void) const
+bool wxControl::MSWCreateControl(const wxChar *classname,
+                                 const wxString& label,
+                                 const wxPoint& pos,
+                                 const wxSize& size,
+                                 long style)

 {
 {

-  wxBuffer[0] = 0;
-  if (GetHWND())
-    GetWindowText((HWND)GetHWND(), wxBuffer, 1000);
+    WXDWORD exstyle;
+    WXDWORD msStyle = MSWGetStyle(style, &exstyle);

 
 

-  return wxString(wxBuffer);
+    return MSWCreateControl(classname, msStyle, pos, size, label, exstyle);

 }
 
 }
 

-// Call this repeatedly for several wnds to find the overall size
-// of the widget.
-// Call it initially with -1 for all values in rect.
-// Keep calling for other widgets, and rect will be modified
-// to calculate largest bounding rectangle.
-void wxFindMaxSize(WXHWND wnd, RECT *rect)
+bool wxControl::MSWCreateControl(const wxChar *classname,
+                                 WXDWORD style,
+                                 const wxPoint& pos,
+                                 const wxSize& size,
+                                 const wxString& label,
+                                 WXDWORD exstyle)

 {
 {

-  int left = rect->left;
-  int right = rect->right;
-  int top = rect->top;
-  int bottom = rect->bottom;
+    // 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);
+    }

 
 

-  GetWindowRect((HWND) wnd, rect);
+    // all controls should have these styles (wxWindows creates all controls
+    // visible by default)
+    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
+                       (
+                        exstyle,            // extended style
+                        classname,          // the kind of control to create
+                        label,              // the window name
+                        style,              // the window style
+                        x, y, w, h,         // the window position and size
+                        GetHwndOf(GetParent()),  // parent
+                        (HMENU)GetId(),     // child id
+                        wxGetInstance(),    // app instance
+                        NULL                // creation parameters
+                       );
+
+    if ( !m_hWnd )
+    {
+        wxLogDebug(wxT("Failed to create a control of class '%s'"), classname);
+        wxFAIL_MSG(_T("something is very wrong"));

 
 

-  if (left < 0)
-    return;
+        return FALSE;
+    }

 
 

-  if (left < rect->left)
-    rect->left = left;
+#if wxUSE_CTL3D
+    if ( want3D )
+    {
+        Ctl3dSubclassCtl(GetHwnd());
+        m_useCtl3D = TRUE;
+    }
+#endif // wxUSE_CTL3D

 
 

-  if (right > rect->right)
-    rect->right = right;
+    // install wxWindows window proc for this window
+    SubclassWin(m_hWnd);

 
 

-  if (top < rect->top)
-    rect->top = top;
+    // controls use the same font and colours as their parent dialog by default
+    InheritAttributes();

 
 

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

 
 

+    return TRUE;

 }
 
 }
 

-/*
-// Not currently used
-void wxConvertDialogToPixels(wxWindow *control, int *x, int *y)
+wxSize wxControl::DoGetBestSize() const

 {
 {

-  if (control->m_windowParent && control->m_windowParent->is_dialog)
-  {
-    DWORD word = GetDialogBaseUnits();
-    int xs = LOWORD(word);
-    int ys = HIWORD(word);
-    *x = (int)(*x * xs/4);
-    *y = (int)(*y * ys/8);
-  }
-  else
-  {
-    *x = *x;
-    *y = *y;
-  }
+    return wxSize(DEFAULT_ITEM_WIDTH, DEFAULT_ITEM_HEIGHT);

 }
 }

-*/
-
-#if 0
-// We can't rely on Windows giving us events corresponding to the wxWindows Z-ordering.
-// E.g. we can't push a wxGroupBox to the back for editing purposes.
-// Convert the item event to parent coordinates, then search for
-// an item that could receive this event.
-wxControl *wxFakeItemEvent(wxWindow *parent, wxControl *item, wxMouseEvent& event)
+
+bool wxControl::ProcessCommand(wxCommandEvent& event)

 {
 {

-  int x, y;
-  item->GetPosition(&x, &y);
-  event.m_x += x;
-  event.m_y += y;
-
-  wxNode *node = parent->GetChildren()->Last();
-  while (node)
-  {
-    wxControl *newItem = (wxControl *)node->Data();
-    if (newItem->IsSelected() && newItem->SelectionHandleHitTest(event.x, event.GetY()))
-    {
-      // This event belongs to the panel.
-      parent->GetEventHandler()->OldOnMouseEvent(event);
-      return NULL;
-    }
-    else if (newItem->HitTest(event.x, event.GetY()))
+#if WXWIN_COMPATIBILITY
+    if ( m_callback )

     {
     {

-      int x1, y1;
-      newItem->GetPosition(&x1, &y1);
-      event.x -= x1;
-      event.GetY() -= y1;
-      newItem->OldOnMouseEvent(event);
-      return newItem;
+        (void)(*m_callback)(*this, event);
+
+        return TRUE;

     }
     }

-    node = node->Previous();
-  }
-  // No takers, so do what we would have done anyway.
-  event.x -= x;
-  event.y -= y;
-  item->OldOnMouseEvent(event);
-  return item;
-}
-#endif
+    else
+#endif // WXWIN_COMPATIBILITY

 
 

-void wxControl::MSWOnMouseMove(const int x, const int y, const WXUINT flags)
-{
-  // 'normal' move event...
-  // Set cursor, but only if we're not in 'busy' mode
-
-/*
-  // Trouble with this is that it sets the cursor for controls too :-(
-  if (m_windowCursor.Ok() && !wxIsBusy())
-    ::SetCursor(m_windowCursor.GetHCURSOR());
-*/
-
-  wxMouseEvent event(wxEVENT_TYPE_MOTION);
-
-/*
-  float px = (float)x;
-  float py = (float)y;
-
-  MSWDeviceToLogical(&px, &py);
-
-  CalcUnscrolledPosition((int)px, (int)py, &event.m_x, &event.m_y);
-*/
-
-  event.m_x = x; event.m_y = y;
-  event.m_shiftDown = ((flags & MK_SHIFT) != 0);
-  event.m_controlDown = ((flags & MK_CONTROL) != 0);
-  event.m_leftDown = ((flags & MK_LBUTTON) != 0);
-  event.m_middleDown = ((flags & MK_MBUTTON) != 0);
-  event.m_rightDown = ((flags & MK_RBUTTON) != 0);
-  event.SetTimestamp(wxApp::sm_lastMessageTime);
-  event.SetEventObject( this );
-
-  // Window gets a click down message followed by a mouse move
-  // message even if position isn't changed!  We want to discard
-  // the trailing move event if x and y are the same.
-  if ((m_lastEvent == wxEVENT_TYPE_RIGHT_DOWN || m_lastEvent == wxEVENT_TYPE_LEFT_DOWN ||
-       m_lastEvent == wxEVENT_TYPE_MIDDLE_DOWN) &&
-      (m_lastXPos == event.GetX() && m_lastYPos == event.GetY()))
-  {
-    m_lastXPos = event.GetX(); m_lastYPos = event.GetY();
-    m_lastEvent = wxEVENT_TYPE_MOTION;
-    return;
-  }
-
-  m_lastEvent = wxEVENT_TYPE_MOTION;
-  m_lastXPos = event.GetX(); m_lastYPos = event.GetY();
-  GetEventHandler()->OldOnMouseEvent(event);
+    return GetEventHandler()->ProcessEvent(event);

 }
 
 }
 

-long wxControl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
+#ifdef __WIN95__
+bool wxControl::MSWOnNotify(int idCtrl,
+                            WXLPARAM lParam,
+                            WXLPARAM* result)

 {
 {

-  return wxWindow::MSWWindowProc(nMsg, wParam, lParam);
-}
+    wxEventType eventType = wxEVT_NULL;

 
 

-bool wxControl::MSWNotify(const WXWPARAM wParam, const WXLPARAM lParam)
-{
-#if defined(__WIN95__)
-       wxCommandEvent event(0, m_windowId);
-       int eventType = 0;
-       NMHDR *hdr1 = (NMHDR*) lParam;
-       switch ( hdr1->code )
-       {
-               case NM_CLICK:
-               {
-                       eventType = wxEVT_COMMAND_LEFT_CLICK;
-                       break;
-               }
-               case NM_DBLCLK:
-               {
-                       eventType = wxEVT_COMMAND_LEFT_DCLICK;
-                       break;
-               }
-               case NM_RCLICK:
-               {
-                       eventType = wxEVT_COMMAND_RIGHT_CLICK;
-                       break;
-               }
-               case NM_RDBLCLK:
-               {
-                       eventType = wxEVT_COMMAND_RIGHT_DCLICK;
-                       break;
-               }
-               case NM_SETFOCUS:
-               {
-                       eventType = wxEVT_COMMAND_SET_FOCUS;
-                       break;
-               }
-               case NM_KILLFOCUS:
-               {
-                       eventType = wxEVT_COMMAND_KILL_FOCUS;
-                       break;
-               }
-               case NM_RETURN:
-               {
-                       eventType = wxEVT_COMMAND_ENTER;
-                       break;
-               }
-/* Not implemented
-               case NM_OUTOFMEMORY:
-               {
-                       eventType = wxEVT_COMMAND_OUT_OF_MEMORY;
-                       break;
-               }
-*/
-               default :
-                       return FALSE;
-                       break;
-       }
+    NMHDR *hdr = (NMHDR*) lParam;
+    switch ( hdr->code )
+    {
+        case NM_CLICK:
+            eventType = wxEVT_COMMAND_LEFT_CLICK;
+            break;
+
+        case NM_DBLCLK:
+            eventType = wxEVT_COMMAND_LEFT_DCLICK;
+            break;
+
+        case NM_RCLICK:
+            eventType = wxEVT_COMMAND_RIGHT_CLICK;
+            break;
+
+        case NM_RDBLCLK:
+            eventType = wxEVT_COMMAND_RIGHT_DCLICK;
+            break;
+
+        case NM_SETFOCUS:
+            eventType = wxEVT_COMMAND_SET_FOCUS;
+            break;
+
+        case NM_KILLFOCUS:
+            eventType = wxEVT_COMMAND_KILL_FOCUS;
+            break;
+
+        case NM_RETURN:
+            eventType = wxEVT_COMMAND_ENTER;
+            break;
+
+        default:
+            return wxWindow::MSWOnNotify(idCtrl, lParam, result);
+    }
+
+    wxCommandEvent event(wxEVT_NULL, m_windowId);

     event.SetEventType(eventType);
     event.SetEventType(eventType);

-       event.SetEventObject(this);
+    event.SetEventObject(this);

 
 

-       if ( !ProcessEvent(event) )
-               return FALSE;
-       return TRUE;
-#else
-  return FALSE;
-#endif
+    return GetEventHandler()->ProcessEvent(event);

 }
 }

+#endif // Win95

 
 

-/*
- * Allocates control IDs within the appropriate range
- */
+void wxControl::OnEraseBackground(wxEraseEvent& event)
+{
+    // 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);

 
 

-int NewControlId(void)
-{
-  static int controlId = 0;
-  controlId ++;
-  return controlId;
+    HBRUSH hBrush = ::CreateSolidBrush(wxColourToRGB(GetBackgroundColour()));
+
+    HDC hdc = GetHdcOf((*event.GetDC()));
+    int mode = ::SetMapMode(hdc, MM_TEXT);
+
+    ::FillRect(hdc, &rect, hBrush);
+    ::DeleteObject(hBrush);
+    ::SetMapMode(hdc, mode);

 }
 
 }
 

-void wxControl::ProcessCommand (wxCommandEvent & event)
+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
+    )

 {
 {

-  // Tries:
-  // 1) A callback function (to become obsolete)
-  // 2) OnCommand, starting at this window and working up parent hierarchy
-  // 3) OnCommand then calls ProcessEvent to search the event tables.
-  if (m_callback)
+#if wxUSE_CTL3D
+    if ( m_useCtl3D )

     {
     {

-      (void) (*(m_callback)) (*this, event);
+        HBRUSH hbrush = Ctl3dCtlColorEx(message, wParam, lParam);
+        return (WXHBRUSH) hbrush;

     }
     }

+#endif // wxUSE_CTL3D
+
+    HDC hdc = (HDC)pDC;
+    if (GetParent()->GetTransparentBackground())
+        SetBkMode(hdc, TRANSPARENT);

     else
     else

-    {
-      GetEventHandler()->OnCommand(*this, event);
-    }
-}
+        SetBkMode(hdc, OPAQUE);

 
 

-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.
+    wxColour colBack = GetBackgroundColour();

 
 

-  RECT rect;
-  ::GetClientRect((HWND) GetHWND(), &rect);
+    ::SetBkColor(hdc, wxColourToRGB(colBack));
+    ::SetTextColor(hdc, wxColourToRGB(GetForegroundColour()));

 
 

-  HBRUSH hBrush = ::CreateSolidBrush(PALETTERGB(GetBackgroundColour().Red(), GetBackgroundColour().Green(), GetBackgroundColour().Blue()));
-  int mode = ::SetMapMode((HDC) event.GetDC()->GetHDC(), MM_TEXT);
+    wxBrush *brush = wxTheBrushList->FindOrCreateBrush(colBack, wxSOLID);

 
 

-  ::FillRect ((HDC) event.GetDC()->GetHDC(), &rect, hBrush);
-  ::DeleteObject(hBrush);
-  ::SetMapMode((HDC) event.GetDC()->GetHDC(), mode);
+    return (WXHBRUSH)brush->GetResourceHandle();

 }
 
 }
 

-void wxControl::SetClientSize (const int width, const int height)
+WXDWORD wxControl::MSWGetStyle(long style, WXDWORD *exstyle) const

 {
 {

-  SetSize (-1, -1, width, height);
+    long msStyle = wxWindow::MSWGetStyle(style, exstyle);
+
+    if ( AcceptsFocus() )
+    {
+        msStyle |= WS_TABSTOP;
+    }
+
+    return msStyle;

 }
 
 }
 

-void wxControl::Centre (const int direction)
+// ---------------------------------------------------------------------------
+// global functions
+// ---------------------------------------------------------------------------
+
+// Call this repeatedly for several wnds to find the overall size
+// of the widget.
+// Call it initially with -1 for all values in rect.
+// Keep calling for other widgets, and rect will be modified
+// to calculate largest bounding rectangle.
+void wxFindMaxSize(WXHWND wnd, RECT *rect)

 {
 {

-  int x, y, width, height, panel_width, panel_height, new_x, new_y;
+    int left = rect->left;
+    int right = rect->right;
+    int top = rect->top;
+    int bottom = rect->bottom;

 
 

-  wxWindow *parent = (wxWindow *) GetParent ();
-  if (!parent)
-    return;
+    GetWindowRect((HWND) wnd, rect);

 
 

-  parent->GetClientSize (&panel_width, &panel_height);
-  GetSize (&width, &height);
-  GetPosition (&x, &y);
+    if (left < 0)
+        return;

 
 

-  new_x = x;
-  new_y = y;
+    if (left < rect->left)
+        rect->left = left;

 
 

-  if (direction & wxHORIZONTAL)
-    new_x = (int) ((panel_width - width) / 2);
+    if (right > rect->right)
+        rect->right = right;

 
 

-  if (direction & wxVERTICAL)
-    new_y = (int) ((panel_height - height) / 2);
+    if (top < rect->top)
+        rect->top = top;

 
 

-  SetSize (new_x, new_y, width, height);
-  int temp_x, temp_y;
-  GetPosition (&temp_x, &temp_y);
-  GetPosition (&temp_x, &temp_y);
+    if (bottom > rect->bottom)
+        rect->bottom = bottom;

 }
 
 }
 

-
+#endif // wxUSE_CONTROLS