X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/43d811ea55a6dee36e17e6815dcd891a82d62e28..891ad68ff5ac338d81ea0c4ff176601761e73517:/src/msw/control.cpp diff --git a/src/msw/control.cpp b/src/msw/control.cpp index b173d2bd58..542d3d7b08 100644 --- a/src/msw/control.cpp +++ b/src/msw/control.cpp @@ -6,7 +6,7 @@ // Created: 01/02/97 // RCS-ID: $Id$ // Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ @@ -21,13 +21,16 @@ #endif #ifndef WX_PRECOMP +#include "wx/event.h" #include "wx/app.h" #include "wx/dcclient.h" #endif +#include "wx/control.h" + #include "wx/msw/private.h" -#if defined(__WIN95__) && !defined(__GNUWIN32__) +#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__) #include #endif @@ -40,7 +43,7 @@ IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow) BEGIN_EVENT_TABLE(wxControl, wxWindow) - EVT_ERASE_BACKGROUND(wxControl::OnEraseBackground) + EVT_ERASE_BACKGROUND(wxControl::OnEraseBackground) END_EVENT_TABLE() #endif @@ -50,6 +53,7 @@ wxControl::wxControl(void) m_backgroundColour = *wxWHITE; m_foregroundColour = *wxBLACK; m_callback = 0; +// m_windowCursor = wxNullCursor; // To avoid the standard cursor being used } wxControl::~wxControl(void) @@ -61,7 +65,7 @@ wxControl::~wxControl(void) wxWindow *parent = (wxWindow *)GetParent(); if (parent) { - if (parent->GetDefaultItem() == this) + if (parent->GetDefaultItem() == (wxButton*) this) parent->SetDefaultItem(NULL); } } @@ -74,9 +78,12 @@ void wxControl::SetLabel(const wxString& label) wxString wxControl::GetLabel(void) const { - wxBuffer[0] = 0; - if (GetHWND()) - GetWindowText((HWND)GetHWND(), wxBuffer, 1000); + wxBuffer[0] = 0; + if (GetHWND()) + { + int len = GetWindowText((HWND)GetHWND(), wxBuffer, 256); + wxBuffer[len] = 0; + } return wxString(wxBuffer); } @@ -112,191 +119,54 @@ void wxFindMaxSize(WXHWND wnd, RECT *rect) } -/* -// Not currently used -void wxConvertDialogToPixels(wxWindow *control, int *x, int *y) -{ - 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; - } -} -*/ - -#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) +#ifdef __WIN95__ +bool wxControl::MSWOnNotify(int idCtrl, + WXLPARAM lParam, + WXLPARAM* result) { - 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())) + wxCommandEvent event(wxEVT_NULL, m_windowId); + wxEventType eventType = wxEVT_NULL; + NMHDR *hdr1 = (NMHDR*) lParam; + switch ( hdr1->code ) { - int x1, y1; - newItem->GetPosition(&x1, &y1); - event.x -= x1; - event.GetY() -= y1; - newItem->OldOnMouseEvent(event); - return newItem; - } - 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 + case NM_CLICK: + eventType = wxEVT_COMMAND_LEFT_CLICK; + break; -void wxControl::MSWOnMouseMove(const int x, const int y, const WXUINT flags) -{ -/* - // Trouble with this is that it sets the cursor for controls too :-( - if (m_windowCursor.Ok() && !wxIsBusy()) - ::SetCursor(m_windowCursor.GetHCURSOR()); -*/ + case NM_DBLCLK: + eventType = wxEVT_COMMAND_LEFT_DCLICK; + break; - if (!m_mouseInWindow) - { - // Generate an ENTER event - m_mouseInWindow = TRUE; - MSWOnMouseEnter(x, y, flags); - } + case NM_RCLICK: + eventType = wxEVT_COMMAND_RIGHT_CLICK; + break; - wxMouseEvent event(wxEVT_MOTION); - - 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 == wxEVT_RIGHT_DOWN || m_lastEvent == wxEVT_LEFT_DOWN || - m_lastEvent == wxEVT_MIDDLE_DOWN) && - (m_lastXPos == event.GetX() && m_lastYPos == event.GetY())) - { - m_lastXPos = event.GetX(); m_lastYPos = event.GetY(); - m_lastEvent = wxEVT_MOTION; - return; - } + case NM_RDBLCLK: + eventType = wxEVT_COMMAND_RIGHT_DCLICK; + break; - m_lastEvent = wxEVT_MOTION; - m_lastXPos = event.GetX(); m_lastYPos = event.GetY(); - GetEventHandler()->OldOnMouseEvent(event); -} + case NM_SETFOCUS: + eventType = wxEVT_COMMAND_SET_FOCUS; + break; -long wxControl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) -{ - return wxWindow::MSWWindowProc(nMsg, wParam, lParam); -} + case NM_KILLFOCUS: + eventType = wxEVT_COMMAND_KILL_FOCUS; + break; -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; - } - event.SetEventType(eventType); - event.SetEventObject(this); - - if ( !ProcessEvent(event) ) - return FALSE; - return TRUE; -#else - return FALSE; -#endif -} + case NM_RETURN: + eventType = wxEVT_COMMAND_ENTER; + break; -/* - * Allocates control IDs within the appropriate range - */ + default: + return wxWindow::MSWOnNotify(idCtrl, lParam, result); + } + event.SetEventType(eventType); + event.SetEventObject(this); -int NewControlId(void) -{ - static int controlId = 0; - controlId ++; - return controlId; + return GetEventHandler()->ProcessEvent(event); } +#endif // Win95 void wxControl::ProcessCommand (wxCommandEvent & event) { @@ -332,12 +202,12 @@ void wxControl::OnEraseBackground(wxEraseEvent& event) ::SetMapMode((HDC) event.GetDC()->GetHDC(), mode); } -void wxControl::SetClientSize (const int width, const int height) +void wxControl::SetClientSize (int width, int height) { SetSize (-1, -1, width, height); } -void wxControl::Centre (const int direction) +void wxControl::Centre (int direction) { int x, y, width, height, panel_width, panel_height, new_x, new_y;