X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dbda9e86f0e5ec1184bc16d135bb7205bc99236e..fc7840aa33c00b255ca088bd81c195835ac67419:/src/msw/window.cpp diff --git a/src/msw/window.cpp b/src/msw/window.cpp index 9dcf9a86a1..d398797f0f 100644 --- a/src/msw/window.cpp +++ b/src/msw/window.cpp @@ -2,15 +2,23 @@ // Name: windows.cpp // Purpose: wxWindow // Author: Julian Smart -// Modified by: +// Modified by: VZ on 13.05.99: no more Default(), MSWOnXXX() reorganisation // Created: 04/01/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart and Markus Holzem // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// +// =========================================================================== +// declarations +// =========================================================================== + +// --------------------------------------------------------------------------- +// headers +// --------------------------------------------------------------------------- + #ifdef __GNUG__ -#pragma implementation "window.h" + #pragma implementation "window.h" #endif // For compilers that support precompilation, includes "wx.h". @@ -33,7 +41,6 @@ #include "wx/frame.h" #include "wx/listbox.h" #include "wx/button.h" - #include "wx/settings.h" #include "wx/msgdlg.h" #include @@ -49,12 +56,18 @@ #include "wx/menuitem.h" #include "wx/log.h" + +#if wxUSE_TOOLTIPS #include "wx/tooltip.h" +#endif + #include "wx/intl.h" #include "wx/log.h" #include "wx/msw/private.h" +#include "wx/textctrl.h" + #include #ifndef __GNUWIN32__ @@ -66,7 +79,7 @@ #include #endif -#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__) +#if ( defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__ ) #include #endif @@ -76,7 +89,6 @@ #endif #endif -// all these are defined in #ifdef GetCharWidth #undef GetCharWidth #endif @@ -93,6 +105,18 @@ #undef GetClassInfo #endif +// --------------------------------------------------------------------------- +// macros +// --------------------------------------------------------------------------- + +// standard macros missing from some compilers headers +#ifndef GET_X_LPARAM + #define GET_X_LPARAM(lp) ((int)(short)LOWORD(lp)) + #define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp)) +#endif // GET_X_LPARAM + +// --------------------------------------------------------------------------- +// --------------------------------------------------------------------------- #ifdef __WXDEBUG__ const char *wxGetMessageName(int message); #endif //__WXDEBUG__ @@ -107,21 +131,28 @@ void wxAssociateWinWithHandle(HWND hWnd, wxWindow *win); wxWindow *wxFindWinFromHandle(WXHWND hWnd); #if !USE_SHARED_LIBRARY - IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxEvtHandler) + IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowBase) #endif -BEGIN_EVENT_TABLE(wxWindow, wxEvtHandler) - EVT_CHAR(wxWindow::OnChar) +// --------------------------------------------------------------------------- +// event tables +// --------------------------------------------------------------------------- + +BEGIN_EVENT_TABLE(wxWindow, wxWindowBase) EVT_ERASE_BACKGROUND(wxWindow::OnEraseBackground) EVT_SYS_COLOUR_CHANGED(wxWindow::OnSysColourChanged) EVT_INIT_DIALOG(wxWindow::OnInitDialog) EVT_IDLE(wxWindow::OnIdle) END_EVENT_TABLE() +// =========================================================================== +// implementation +// =========================================================================== + // Find an item given the MS Windows id wxWindow *wxWindow::FindItem(int id) const { -// if (!GetChildren()) +// if ( !GetChildren() ) // return NULL; wxNode *current = GetChildren().First(); while (current) @@ -129,18 +160,18 @@ wxWindow *wxWindow::FindItem(int id) const wxWindow *childWin = (wxWindow *)current->Data(); wxWindow *wnd = childWin->FindItem(id) ; - if (wnd) + if ( wnd ) return wnd ; - if (childWin->IsKindOf(CLASSINFO(wxControl))) + if ( childWin->IsKindOf(CLASSINFO(wxControl)) ) { wxControl *item = (wxControl *)childWin; - if (item->GetId() == id) + if ( item->GetId() == id ) return item; else { // In case it's a 'virtual' control (e.g. radiobox) - if (item->GetSubcontrols().Member((wxObject *)id)) + if ( item->GetSubcontrols().Member((wxObject *)id) ) return item; } } @@ -152,7 +183,7 @@ wxWindow *wxWindow::FindItem(int id) const // Find an item given the MS Windows handle wxWindow *wxWindow::FindItemByHWND(WXHWND hWnd, bool controlOnly) const { -// if (!GetChildren()) +// if ( !GetChildren() ) // return NULL; wxNode *current = GetChildren().First(); while (current) @@ -161,13 +192,13 @@ wxWindow *wxWindow::FindItemByHWND(WXHWND hWnd, bool controlOnly) const // Do a recursive search. wxWindow *parent = (wxWindow *)obj ; wxWindow *wnd = parent->FindItemByHWND(hWnd) ; - if (wnd) + if ( wnd ) return wnd ; - if ((!controlOnly) || obj->IsKindOf(CLASSINFO(wxControl))) + if ( (!controlOnly) || obj->IsKindOf(CLASSINFO(wxControl)) ) { wxWindow *item = (wxWindow *)current->Data(); - if ((HWND)(item->GetHWND()) == (HWND) hWnd) + if ( (HWND)(item->GetHWND()) == (HWND) hWnd ) return item; else { @@ -186,11 +217,43 @@ bool wxWindow::MSWCommand(WXUINT WXUNUSED(param), WXWORD WXUNUSED(id)) return FALSE; } -bool wxWindow::MSWNotify(WXWPARAM WXUNUSED(wParam), - WXLPARAM lParam, - WXLPARAM* WXUNUSED(result)) -{ #ifdef __WIN95__ +// FIXME: VZ: I'm not sure at all that the order of processing is correct +bool wxWindow::HandleNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) +{ + LPNMHDR hdr = (LPNMHDR)lParam; + HWND hWnd = hdr->hwndFrom; + wxWindow *win = wxFindWinFromHandle((WXHWND)hWnd); + + // is this one of our windows? + if ( win ) + { + return win->MSWOnNotify(idCtrl, lParam, result); + } + + // try all our children + wxWindowList::Node *node = GetChildren().GetFirst(); + while ( node ) + { + wxWindow *child = node->GetData(); + if ( child->MSWOnNotify(idCtrl, lParam, result) ) + { + return TRUE; + + break; + } + + node = node->GetNext(); + } + + // finally try this window too (catches toolbar case) + return MSWOnNotify(idCtrl, lParam, result); +} + +bool wxWindow::MSWOnNotify(int WXUNUSED(idCtrl), + WXLPARAM lParam, + WXLPARAM* WXUNUSED(result)) +{ #if wxUSE_TOOLTIPS NMHDR* hdr = (NMHDR *)lParam; if ( hdr->code == TTN_NEEDTEXT && m_tooltip ) @@ -201,203 +264,80 @@ bool wxWindow::MSWNotify(WXWPARAM WXUNUSED(wParam), // processed return TRUE; } -#endif -#endif +#endif // wxUSE_TOOLTIPS return FALSE; } +#endif // __WIN95__ void wxWindow::PreDelete(WXHDC WXUNUSED(dc)) { } -WXHWND wxWindow::GetHWND(void) const -{ - return (WXHWND) m_hWnd; -} - -void wxWindow::SetHWND(WXHWND hWnd) -{ - m_hWnd = hWnd; -} - // ---------------------------------------------------------------------------- // constructors and such // ---------------------------------------------------------------------------- void wxWindow::Init() { - // Generic - m_windowId = 0; - m_isShown = TRUE; - m_windowStyle = 0; - m_windowParent = NULL; - m_windowEventHandler = this; - m_windowCursor = *wxSTANDARD_CURSOR; - m_children = new wxList; + // generic + InitBase(); + + // MSW specific m_doubleClickAllowed = 0 ; m_winCaptured = FALSE; - m_constraints = NULL; - m_constraintsInvolvedIn = NULL; - m_windowSizer = NULL; - m_sizerParent = NULL; - m_autoLayout = FALSE; - m_windowValidator = NULL; - - // MSW-specific - m_hWnd = 0; - m_winEnabled = TRUE; - m_caretWidth = m_caretHeight = 0; + + // caret stuff: initially there is no caret at all + m_caretWidth = + m_caretHeight = 0; m_caretEnabled = m_caretShown = FALSE; - m_inOnSize = FALSE; - m_minSizeX = - m_minSizeY = - m_maxSizeX = - m_maxSizeY = -1; m_isBeingDeleted = FALSE; m_oldWndProc = 0; -#ifndef __WIN32__ - m_globalHandle = 0; -#endif m_useCtl3D = FALSE; m_mouseInWindow = FALSE; - m_windowParent = NULL; - m_defaultItem = NULL; - - wxSystemSettings settings; - - m_backgroundColour = settings.GetSystemColour(wxSYS_COLOUR_3DFACE) ; - m_foregroundColour = *wxBLACK; - // wxWnd - m_lastMsg = 0; - m_lastWParam = 0; - m_lastLParam = 0; m_hMenu = 0; m_xThumbSize = 0; m_yThumbSize = 0; m_backgroundTransparent = FALSE; - m_lastXPos = (float)-1.0; - m_lastYPos = (float)-1.0; - m_lastEvent = -1; - m_returnCode = 0; - -#if wxUSE_DRAG_AND_DROP - m_pDropTarget = NULL; -#endif - -#if wxUSE_TOOLTIPS - m_tooltip = NULL; -#endif -} + // as all windows are created with WS_VISIBLE style... + m_isShown = TRUE; -wxWindow::wxWindow() -{ - Init(); +#if wxUSE_MOUSEEVENT_HACK + m_lastMouseX = + m_lastMouseY = -1; + m_lastMouseEvent = -1; +#endif // wxUSE_MOUSEEVENT_HACK } // Destructor wxWindow::~wxWindow() { - // Remove potential dangling pointer - if (GetParent() && GetParent()->IsKindOf(CLASSINFO(wxPanel))) - { - wxPanel* panel = (wxPanel*) GetParent(); - if (panel->GetLastFocus() == this) - panel->SetLastFocus((wxWindow*) NULL); - } - m_isBeingDeleted = TRUE; - // first of all, delete the things on which nothing else depends - -#if wxUSE_TOOLTIPS - wxDELETE(m_tooltip); -#endif - - // JACS - if behaviour is odd, restore this - // to the start of ~wxWindow. Vadim has changed - // it to nearer the end. Unsure of side-effects - // e.g. when deleting associated global data. - // Restore old Window proc, if required - // UnsubclassWin(); - - // Have to delete constraints/sizer FIRST otherwise - // sizers may try to look at deleted windows as they - // delete themselves. -#if wxUSE_CONSTRAINTS - DeleteRelatedConstraints(); - - if (m_constraints) - { - // This removes any dangling pointers to this window - // in other windows' constraintsInvolvedIn lists. - UnsetConstraints(m_constraints); - delete m_constraints; - m_constraints = NULL; - } - - wxDELETE(m_windowSizer); - - // If this is a child of a sizer, remove self from parent - if (m_sizerParent) - m_sizerParent->RemoveChild((wxWindow *)this); -#endif - - // wxWnd MSWDetachWindowMenu(); - if (m_windowParent) - m_windowParent->RemoveChild(this); + if ( m_parent ) + m_parent->RemoveChild(this); DestroyChildren(); - if (m_hWnd) + if ( m_hWnd ) ::DestroyWindow((HWND)m_hWnd); wxRemoveHandleAssociation(this); m_hWnd = 0; -#ifndef __WIN32__ - if (m_globalHandle) - { - GlobalFree((HGLOBAL) m_globalHandle); - m_globalHandle = 0; - } -#endif - - delete m_children; - m_children = NULL; - // Just in case the window has been Closed, but - // we're then deleting immediately: don't leave - // dangling pointers. - wxPendingDelete.DeleteObject(this); - - // Just in case we've loaded a top-level window via - // wxWindow::LoadNativeDialog but we weren't a dialog - // class - wxTopLevelWindows.DeleteObject(this); - - if ( m_windowValidator ) - delete m_windowValidator; - - // Restore old Window proc, if required - // and remove hWnd <-> wxWindow association + // Restore old Window proc, if required and remove hWnd <-> wxWindow + // association UnsubclassWin(); } -// Destroy the window (delayed, if a managed window) -bool wxWindow::Destroy() -{ - delete this; - return TRUE; -} - extern char wxCanvasClassName[]; // real construction (Init() must have been called before!) @@ -411,36 +351,14 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id, parent->AddChild(this); - SetName(name); - - if ( id == -1 ) - m_windowId = (int)NewControlId(); - else - m_windowId = id; - - int x = pos.x; - int y = pos.y; - int width = size.x; - int height = size.y; - - // To be consistent with wxGTK - if (width == -1) - width = 20; - if (height == -1) - height = 20; - - wxSystemSettings settings; - - m_windowStyle = style; - DWORD msflags = 0; - if (style & wxBORDER) + if ( style & wxBORDER ) msflags |= WS_BORDER; - if (style & wxTHICK_FRAME) + if ( style & wxTHICK_FRAME ) msflags |= WS_THICKFRAME; msflags |= WS_CHILD | WS_VISIBLE; - if (style & wxCLIP_CHILDREN) + if ( style & wxCLIP_CHILDREN ) msflags |= WS_CLIPCHILDREN; bool want3D; @@ -448,35 +366,43 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id, // Even with extended styles, need to combine with WS_BORDER // for them to look right. - if (want3D || (m_windowStyle & wxSIMPLE_BORDER) || (m_windowStyle & wxRAISED_BORDER) || + if ( want3D || (m_windowStyle & wxSIMPLE_BORDER) || (m_windowStyle & wxRAISED_BORDER ) || (m_windowStyle & wxSUNKEN_BORDER) || (m_windowStyle & wxDOUBLE_BORDER)) + { msflags |= WS_BORDER; + } MSWCreate(m_windowId, parent, wxCanvasClassName, this, NULL, - x, y, width, height, msflags, NULL, exStyle); + pos.x, pos.y, + WidthDefault(size.x), HeightDefault(size.y), + msflags, NULL, exStyle); return TRUE; } void wxWindow::SetFocus() { - HWND hWnd = (HWND) GetHWND(); - if (hWnd) + HWND hWnd = GetHwnd(); + if ( hWnd ) ::SetFocus(hWnd); } -void wxWindow::Enable(bool enable) +bool wxWindow::Enable(bool enable) { - m_winEnabled = enable; - HWND hWnd = (HWND) GetHWND(); - if (hWnd) + if ( !wxWindowBase::Enable(enable) ) + return FALSE; + + HWND hWnd = GetHwnd(); + if ( hWnd ) ::EnableWindow(hWnd, (BOOL)enable); + + return TRUE; } void wxWindow::CaptureMouse() { - HWND hWnd = (HWND) GetHWND(); - if (hWnd && !m_winCaptured) + HWND hWnd = GetHwnd(); + if ( hWnd && !m_winCaptured ) { SetCapture(hWnd); m_winCaptured = TRUE; @@ -485,59 +411,25 @@ void wxWindow::CaptureMouse() void wxWindow::ReleaseMouse() { - if (m_winCaptured) + if ( m_winCaptured ) { ReleaseCapture(); m_winCaptured = FALSE; } } -void wxWindow::SetAcceleratorTable(const wxAcceleratorTable& accel) -{ - m_acceleratorTable = accel; -} - - -// Push/pop event handler (i.e. allow a chain of event handlers -// be searched) -void wxWindow::PushEventHandler(wxEvtHandler *handler) -{ - handler->SetNextHandler(GetEventHandler()); - SetEventHandler(handler); -} - -wxEvtHandler *wxWindow::PopEventHandler(bool deleteHandler) -{ - if ( GetEventHandler() ) - { - wxEvtHandler *handlerA = GetEventHandler(); - wxEvtHandler *handlerB = handlerA->GetNextHandler(); - handlerA->SetNextHandler(NULL); - SetEventHandler(handlerB); - if ( deleteHandler ) - { - delete handlerA; - return NULL; - } - else - return handlerA; - } - else - return NULL; -} - #if wxUSE_DRAG_AND_DROP void wxWindow::SetDropTarget(wxDropTarget *pDropTarget) { - if ( m_pDropTarget != 0 ) { - m_pDropTarget->Revoke(m_hWnd); - delete m_pDropTarget; + if ( m_dropTarget != 0 ) { + m_dropTarget->Revoke(m_hWnd); + delete m_dropTarget; } - m_pDropTarget = pDropTarget; - if ( m_pDropTarget != 0 ) - m_pDropTarget->Register(m_hWnd); + m_dropTarget = pDropTarget; + if ( m_dropTarget != 0 ) + m_dropTarget->Register(m_hWnd); } #endif // wxUSE_DRAG_AND_DROP @@ -549,8 +441,8 @@ void wxWindow::SetDropTarget(wxDropTarget *pDropTarget) // JACS void wxWindow::DragAcceptFiles(bool accept) { - HWND hWnd = (HWND) GetHWND(); - if (hWnd) + HWND hWnd = GetHwnd(); + if ( hWnd ) ::DragAcceptFiles(hWnd, (BOOL)accept); } @@ -560,164 +452,177 @@ void wxWindow::DragAcceptFiles(bool accept) #if wxUSE_TOOLTIPS -void wxWindow::SetToolTip(const wxString &tip) +void wxWindow::DoSetToolTip(wxToolTip *tooltip) { - SetToolTip(new wxToolTip(tip)); -} + wxWindowBase::DoSetToolTip(tooltip); -void wxWindow::SetToolTip(wxToolTip *tooltip) -{ if ( m_tooltip ) - delete m_tooltip; - - m_tooltip = tooltip; - m_tooltip->SetWindow(this); + m_tooltip->SetWindow(this); } #endif // wxUSE_TOOLTIPS // Get total size -void wxWindow::GetSize(int *x, int *y) const +void wxWindow::DoGetSize(int *x, int *y) const { - HWND hWnd = (HWND) GetHWND(); + HWND hWnd = GetHwnd(); RECT rect; GetWindowRect(hWnd, &rect); - *x = rect.right - rect.left; - *y = rect.bottom - rect.top; + + if ( x ) + *x = rect.right - rect.left; + if ( y ) + *y = rect.bottom - rect.top; } -void wxWindow::GetPosition(int *x, int *y) const +void wxWindow::DoGetPosition(int *x, int *y) const { - HWND hWnd = (HWND) GetHWND(); + HWND hWnd = GetHwnd(); HWND hParentWnd = 0; - if (GetParent()) + if ( GetParent() ) hParentWnd = (HWND) GetParent()->GetHWND(); RECT rect; GetWindowRect(hWnd, &rect); - // Since we now have the absolute screen coords, - // if there's a parent we must subtract its top left corner + // Since we now have the absolute screen coords, if there's a parent we + // must subtract its top left corner POINT point; point.x = rect.left; point.y = rect.top; - if (hParentWnd) + if ( hParentWnd ) { ::ScreenToClient(hParentWnd, &point); } - // We may be faking the client origin. - // So a window that's really at (0, 30) may appear - // (to wxWin apps) to be at (0, 0). - if (GetParent()) + // We may be faking the client origin. So a window that's really at (0, + // 30) may appear (to wxWin apps) to be at (0, 0). + if ( GetParent() ) { wxPoint pt(GetParent()->GetClientAreaOrigin()); point.x -= pt.x; point.y -= pt.y; } - *x = point.x; - *y = point.y; + + if ( x ) + *x = point.x; + if ( y ) + *y = point.y; } void wxWindow::ScreenToClient(int *x, int *y) const { - HWND hWnd = (HWND) GetHWND(); POINT pt; - pt.x = *x; - pt.y = *y; + if ( x ) + pt.x = *x; + if ( y ) + pt.y = *y; + HWND hWnd = GetHwnd(); ::ScreenToClient(hWnd, &pt); - *x = pt.x; - *y = pt.y; + if ( x ) + *x = pt.x; + if ( y ) + *y = pt.y; } void wxWindow::ClientToScreen(int *x, int *y) const { - HWND hWnd = (HWND) GetHWND(); POINT pt; - pt.x = *x; - pt.y = *y; + if ( x ) + pt.x = *x; + if ( y ) + pt.y = *y; + HWND hWnd = GetHwnd(); ::ClientToScreen(hWnd, &pt); - *x = pt.x; - *y = pt.y; + if ( x ) + *x = pt.x; + if ( y ) + *y = pt.y; } -void wxWindow::SetCursor(const wxCursor& cursor) +bool wxWindow::SetCursor(const wxCursor& cursor) { - m_windowCursor = cursor; - if (m_windowCursor.Ok()) + if ( !wxWindowBase::SetCursor(cursor) ) { - HWND hWnd = (HWND) GetHWND(); + // no change + return FALSE; + } - // Change the cursor NOW if we're within the correct window - POINT point; - ::GetCursorPos(&point); + wxASSERT_MSG( m_cursor.Ok(), + _T("cursor must be valid after call to the base version")); - RECT rect; - ::GetWindowRect(hWnd, &rect); + HWND hWnd = GetHwnd(); - if (::PtInRect(&rect, point) && !wxIsBusy()) - ::SetCursor((HCURSOR) m_windowCursor.GetHCURSOR()); - } + // Change the cursor NOW if we're within the correct window + POINT point; + ::GetCursorPos(&point); - // This will cause big reentrancy problems if wxFlushEvents is implemented. - // wxFlushEvents(); - // return old_cursor; -} + RECT rect; + ::GetWindowRect(hWnd, &rect); + + if ( ::PtInRect(&rect, point) && !wxIsBusy() ) + ::SetCursor((HCURSOR)m_cursor.GetHCURSOR()); + return TRUE; +} // Get size *available for subwindows* i.e. excluding menu bar etc. -void wxWindow::GetClientSize(int *x, int *y) const +void wxWindow::DoGetClientSize(int *x, int *y) const { - HWND hWnd = (HWND) GetHWND(); + HWND hWnd = GetHwnd(); RECT rect; - GetClientRect(hWnd, &rect); - *x = rect.right; - *y = rect.bottom; + ::GetClientRect(hWnd, &rect); + if ( x ) + *x = rect.right; + if ( y ) + *y = rect.bottom; } -void wxWindow::SetSize(int x, int y, int width, int height, int sizeFlags) +void wxWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags) { int currentX, currentY; GetPosition(¤tX, ¤tY); int currentW,currentH; GetSize(¤tW, ¤tH); - if (x == currentX && y == currentY && width == currentW && height == currentH) + if ( x == currentX && y == currentY && width == currentW && height == currentH ) return; int actualWidth = width; int actualHeight = height; int actualX = x; int actualY = y; - if (x == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) + if ( x == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE) ) actualX = currentX; - if (y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) + if ( y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE) ) actualY = currentY; AdjustForParentClientOrigin(actualX, actualY, sizeFlags); - if (width == -1) + if ( width == -1 ) actualWidth = currentW ; - if (height == -1) + if ( height == -1 ) actualHeight = currentH ; - HWND hWnd = (HWND) GetHWND(); - if (hWnd) + HWND hWnd = GetHwnd(); + if ( hWnd ) MoveWindow(hWnd, actualX, actualY, actualWidth, actualHeight, (BOOL)TRUE); } -void wxWindow::SetClientSize(int width, int height) +void wxWindow::DoSetClientSize(int width, int height) { wxWindow *parent = GetParent(); - HWND hWnd = (HWND) GetHWND(); - HWND hParentWnd = (HWND) (HWND) parent->GetHWND(); + HWND hWnd = GetHwnd(); + HWND hParentWnd = (HWND) 0; + if ( parent ) + hParentWnd = (HWND) parent->GetHWND(); RECT rect; - GetClientRect(hWnd, &rect); + ::GetClientRect(hWnd, &rect); RECT rect2; GetWindowRect(hWnd, &rect2); @@ -734,7 +639,7 @@ void wxWindow::SetClientSize(int width, int height) POINT point; point.x = rect2.left; point.y = rect2.top; - if (parent) + if ( parent ) { ::ScreenToClient(hParentWnd, &point); } @@ -757,7 +662,7 @@ wxPoint wxWindow::GetClientAreaOrigin() const // a toolbar that it manages itself). void wxWindow::AdjustForParentClientOrigin(int& x, int& y, int sizeFlags) { - if (((sizeFlags & wxSIZE_NO_ADJUSTMENTS) == 0) && GetParent()) + if ( ((sizeFlags & wxSIZE_NO_ADJUSTMENTS) == 0) && GetParent() ) { wxPoint pt(GetParent()->GetClientAreaOrigin()); x += pt.x; y += pt.y; @@ -766,31 +671,25 @@ void wxWindow::AdjustForParentClientOrigin(int& x, int& y, int sizeFlags) bool wxWindow::Show(bool show) { - HWND hWnd = (HWND) GetHWND(); - int cshow; - if (show) - cshow = SW_SHOW; - else - cshow = SW_HIDE; - ShowWindow(hWnd, (BOOL)cshow); - if (show) + if ( !wxWindowBase::Show(show) ) + return FALSE; + + HWND hWnd = GetHwnd(); + int cshow = show ? SW_SHOW : SW_HIDE; + ::ShowWindow(hWnd, cshow); + + if ( show ) { BringWindowToTop(hWnd); - // Next line causes a crash on NT, apparently. - // UpdateWindow(hWnd); // Should this be here or will it cause inefficiency? } - return TRUE; -} -bool wxWindow::IsShown(void) const -{ - return (::IsWindowVisible((HWND) GetHWND()) != 0); + return TRUE; } int wxWindow::GetCharHeight(void) const { TEXTMETRIC lpTextMetric; - HWND hWnd = (HWND) GetHWND(); + HWND hWnd = GetHwnd(); HDC dc = ::GetDC(hWnd); GetTextMetrics(dc, &lpTextMetric); @@ -802,7 +701,7 @@ int wxWindow::GetCharHeight(void) const int wxWindow::GetCharWidth(void) const { TEXTMETRIC lpTextMetric; - HWND hWnd = (HWND) GetHWND(); + HWND hWnd = GetHwnd(); HDC dc = ::GetDC(hWnd); GetTextMetrics(dc, &lpTextMetric); @@ -812,18 +711,18 @@ int wxWindow::GetCharWidth(void) const } void wxWindow::GetTextExtent(const wxString& string, int *x, int *y, - int *descent, int *externalLeading, const wxFont *theFont, bool) const + int *descent, int *externalLeading, const wxFont *theFont) const { wxFont *fontToUse = (wxFont *)theFont; - if (!fontToUse) - fontToUse = (wxFont *) & m_windowFont; + if ( !fontToUse ) + fontToUse = (wxFont *) & m_font; - HWND hWnd = (HWND) GetHWND(); + HWND hWnd = GetHwnd(); HDC dc = ::GetDC(hWnd); HFONT fnt = 0; HFONT was = 0; - if (fontToUse && fontToUse->Ok()) + if ( fontToUse && fontToUse->Ok() ) { fnt = (HFONT)fontToUse->GetResourceHandle(); if ( fnt ) @@ -835,26 +734,26 @@ void wxWindow::GetTextExtent(const wxString& string, int *x, int *y, GetTextExtentPoint(dc, (const char *)string, (int)string.Length(), &sizeRect); GetTextMetrics(dc, &tm); - if (fontToUse && fnt && was) + if ( fontToUse && fnt && was ) SelectObject(dc,was) ; ReleaseDC(hWnd, dc); *x = sizeRect.cx; *y = sizeRect.cy; - if (descent) *descent = tm.tmDescent; - if (externalLeading) *externalLeading = tm.tmExternalLeading; + if ( descent ) *descent = tm.tmDescent; + if ( externalLeading ) *externalLeading = tm.tmExternalLeading; - // if (fontToUse) + // if ( fontToUse ) // fontToUse->ReleaseResource(); } void wxWindow::Refresh(bool eraseBack, const wxRect *rect) { - HWND hWnd = (HWND) GetHWND(); - if (hWnd) + HWND hWnd = GetHwnd(); + if ( hWnd ) { - if (rect) + if ( rect ) { RECT mswRect; mswRect.left = rect->x; @@ -869,622 +768,489 @@ void wxWindow::Refresh(bool eraseBack, const wxRect *rect) } } -bool wxWindow::ProcessEvent(wxEvent& event) -{ - // we save here the information about the last message because it might be - // overwritten if the event handler sends any messages to our window (case - // in point: wxNotebook::OnSize) - and then if we call Default() later - // (which is done quite often if the message is not processed) it will use - // incorrect values for m_lastXXX variables - WXUINT lastMsg = m_lastMsg; - WXWPARAM lastWParam = m_lastWParam; - WXLPARAM lastLParam = m_lastLParam; - - // call the base version - bool bProcessed = wxEvtHandler::ProcessEvent(event); - - // restore - m_lastMsg = lastMsg; - m_lastWParam = lastWParam; - m_lastLParam = lastLParam; - - return bProcessed; -} +// --------------------------------------------------------------------------- +// Main wxWindows window proc and the window proc for wxWindow +// --------------------------------------------------------------------------- -// Hook for new window just as it's being created, -// when the window isn't yet associated with the handle +// Hook for new window just as it's being created, when the window isn't yet +// associated with the handle wxWindow *wxWndHook = NULL; // Main window proc LRESULT APIENTRY _EXPORT wxWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { + // trace all messages - useful for the debugging +#ifdef __WXDEBUG__ + wxLogTrace(wxTraceMessages, "Processing %s(wParam=%8lx, lParam=%8lx)", + wxGetMessageName(message), wParam, lParam); +#endif // __WXDEBUG__ + wxWindow *wnd = wxFindWinFromHandle((WXHWND) hWnd); - if (!wnd && wxWndHook) + // when we get the first message for the HWND we just created, we associate + // it with wxWindow stored in wxWndHook + if ( !wnd && wxWndHook ) { wxAssociateWinWithHandle(hWnd, wxWndHook); wnd = wxWndHook; wxWndHook = NULL; - wnd->m_hWnd = (WXHWND) hWnd; + wnd->SetHWND((WXHWND)hWnd); } - // Stop right here if we don't have a valid handle in our wxWindow object. - if (wnd && !wnd->m_hWnd) { - wnd->m_hWnd = (WXHWND) hWnd; - long res = wnd->MSWDefWindowProc(message, wParam, lParam ); - wnd->m_hWnd = 0; - return res; - } + LRESULT rc; - if (wnd) { - wnd->m_lastMsg = message; - wnd->m_lastWParam = wParam; - wnd->m_lastLParam = lParam; + // Stop right here if we don't have a valid handle in our wxWindow object. + if ( wnd && !wnd->GetHWND() ) + { + // FIXME: why do we do this? + wnd->SetHWND((WXHWND) hWnd); + rc = wnd->MSWDefWindowProc(message, wParam, lParam ); + wnd->SetHWND(0); } - if (wnd) - return wnd->MSWWindowProc(message, wParam, lParam); else - return DefWindowProc( hWnd, message, wParam, lParam ); -} + { + if ( wnd ) + rc = wnd->MSWWindowProc(message, wParam, lParam); + else + rc = DefWindowProc( hWnd, message, wParam, lParam ); + } -// Should probably have a test for 'genuine' NT -#if defined(__WIN32__) - #define DIMENSION_TYPE short -#else - #define DIMENSION_TYPE int -#endif + return rc; +} -// Main Windows 3 window proc long wxWindow::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) { - wxASSERT( m_lastMsg == message && - m_lastWParam == wParam && m_lastLParam == lParam ); + // did we process the message? + bool processed = FALSE; -#ifdef __WXDEBUG__ - wxLogTrace(wxTraceMessages, "Processing %s(%lx, %lx)", - wxGetMessageName(message), wParam, lParam); -#endif // __WXDEBUG__ + // the return value + union + { + bool allow; + long result; + WXHICON hIcon; + WXHBRUSH hBrush; + } rc; + + // for most messages we should return 0 when we do process the message + rc.result = 0; - HWND hWnd = (HWND)m_hWnd; + HWND hWnd = GetHwnd(); - switch (message) + switch ( message ) { - case WM_ACTIVATE: - { + case WM_ACTIVATE: + { #ifdef __WIN32__ - WORD state = LOWORD(wParam); - WORD minimized = HIWORD(wParam); - HWND hwnd = (HWND)lParam; + WORD state = LOWORD(wParam); + WORD minimized = HIWORD(wParam); + HWND hwnd = (HWND)lParam; #else - WORD state = (WORD)wParam; - WORD minimized = LOWORD(lParam); - HWND hwnd = (HWND)HIWORD(lParam); + WORD state = (WORD)wParam; + WORD minimized = LOWORD(lParam); + HWND hwnd = (HWND)HIWORD(lParam); #endif - MSWOnActivate(state, (minimized != 0), (WXHWND) hwnd); - return 0; + processed = MSWOnActivate(state, minimized != 0, (WXHWND)hwnd); + } break; - } - case WM_SETFOCUS: - { - HWND hwnd = (HWND)wParam; - // return OnSetFocus(hwnd); - if (MSWOnSetFocus((WXHWND) hwnd)) - return 0; - else return MSWDefWindowProc(message, wParam, lParam ); - break; - } - case WM_KILLFOCUS: - { - HWND hwnd = (HWND)lParam; - // return OnKillFocus(hwnd); - if (MSWOnKillFocus((WXHWND) hwnd)) - return 0; - else - return MSWDefWindowProc(message, wParam, lParam ); - break; - } - case WM_CREATE: - { - MSWOnCreate((WXLPCREATESTRUCT) (LPCREATESTRUCT)lParam); - return 0; - break; - } - case WM_SHOWWINDOW: - { - MSWOnShow((wParam != 0), (int) lParam); - break; - } - case WM_PAINT: - { - if (MSWOnPaint()) - return 0; - else return MSWDefWindowProc(message, wParam, lParam ); + case WM_CLOSE: + // process this message for any toplevel window + if ( !GetParent() ) + { + // if we can't close, tell the system that we processed the + // message - otherwise it would close us + processed = !Close(); + } break; - } - case WM_QUERYDRAGICON: - { - HICON hIcon = (HICON)MSWOnQueryDragIcon(); - if ( hIcon ) - return (long)hIcon; - else - return MSWDefWindowProc(message, wParam, lParam ); + + case WM_SETFOCUS: + processed = MSWOnSetFocus((WXHWND)(HWND)wParam); break; - } - case WM_SIZE: - { - int width = LOWORD(lParam); - int height = HIWORD(lParam); - MSWOnSize(width, height, wParam); + case WM_KILLFOCUS: + processed = MSWOnKillFocus((WXHWND)(HWND)wParam); break; - } - case WM_MOVE: - { - wxMoveEvent event(wxPoint(LOWORD(lParam), HIWORD(lParam)), - m_windowId); - event.SetEventObject(this); - if ( !GetEventHandler()->ProcessEvent(event) ) - Default(); - } - break; + case WM_CREATE: + { + bool allow; + processed = MSWOnCreate((WXLPCREATESTRUCT)lParam, &allow); - case WM_WINDOWPOSCHANGING: - { - MSWOnWindowPosChanging((void *)lParam); + // we should return 0 to allow window creation + rc.result = !allow; + } break; - } - case WM_RBUTTONDOWN: - { - int x = (DIMENSION_TYPE) LOWORD(lParam); - int y = (DIMENSION_TYPE) HIWORD(lParam); - MSWOnRButtonDown(x, y, wParam); - break; - } - case WM_RBUTTONUP: - { - int x = (DIMENSION_TYPE) LOWORD(lParam); - int y = (DIMENSION_TYPE) HIWORD(lParam); - MSWOnRButtonUp(x, y, wParam); - break; - } - case WM_RBUTTONDBLCLK: - { - int x = (DIMENSION_TYPE) LOWORD(lParam); - int y = (DIMENSION_TYPE) HIWORD(lParam); - MSWOnRButtonDClick(x, y, wParam); - break; - } - case WM_MBUTTONDOWN: - { - int x = (DIMENSION_TYPE) LOWORD(lParam); - int y = (DIMENSION_TYPE) HIWORD(lParam); - MSWOnMButtonDown(x, y, wParam); + case WM_SHOWWINDOW: + processed = MSWOnShow(wParam != 0, (int)lParam); break; - } - case WM_MBUTTONUP: - { - int x = (DIMENSION_TYPE) LOWORD(lParam); - int y = (DIMENSION_TYPE) HIWORD(lParam); - MSWOnMButtonUp(x, y, wParam); + + case WM_PAINT: + processed = MSWOnPaint(); break; - } - case WM_MBUTTONDBLCLK: - { - int x = (DIMENSION_TYPE) LOWORD(lParam); - int y = (DIMENSION_TYPE) HIWORD(lParam); - MSWOnMButtonDClick(x, y, wParam); + + case WM_QUERYDRAGICON: + processed = MSWOnQueryDragIcon(&rc.hIcon); break; - } - case WM_LBUTTONDOWN: - { - int x = (DIMENSION_TYPE) LOWORD(lParam); - int y = (DIMENSION_TYPE) HIWORD(lParam); - MSWOnLButtonDown(x, y, wParam); + + case WM_SIZE: + processed = MSWOnSize(LOWORD(lParam), HIWORD(lParam), wParam); break; - } - case WM_LBUTTONUP: - { - int x = (DIMENSION_TYPE) LOWORD(lParam); - int y = (DIMENSION_TYPE) HIWORD(lParam); - MSWOnLButtonUp(x, y, wParam); + + case WM_MOVE: + processed = HandleMove(LOWORD(lParam), HIWORD(lParam)); break; - } - case WM_LBUTTONDBLCLK: - { - int x = (DIMENSION_TYPE) LOWORD(lParam); - int y = (DIMENSION_TYPE) HIWORD(lParam); - MSWOnLButtonDClick(x, y, wParam); + + case WM_WINDOWPOSCHANGING: + processed = MSWOnWindowPosChanging((void *)lParam); break; - } - case WM_MOUSEMOVE: - { - int x = (DIMENSION_TYPE) LOWORD(lParam); - int y = (DIMENSION_TYPE) HIWORD(lParam); - MSWOnMouseMove(x, y, wParam); + + case WM_MOUSEMOVE: + case WM_LBUTTONDOWN: + case WM_LBUTTONUP: + case WM_LBUTTONDBLCLK: + case WM_RBUTTONDOWN: + case WM_RBUTTONUP: + case WM_RBUTTONDBLCLK: + case WM_MBUTTONDOWN: + case WM_MBUTTONUP: + case WM_MBUTTONDBLCLK: + { + int x = LOWORD(lParam); + int y = HIWORD(lParam); + + processed = MSWOnMouseEvent(message, x, y, wParam); + } break; - } - case MM_JOY1BUTTONDOWN: - { - int x = LOWORD(lParam); - int y = HIWORD(lParam); - MSWOnJoyDown(wxJOYSTICK1, x, y, wParam); + + case MM_JOY1MOVE: + case MM_JOY2MOVE: + case MM_JOY1ZMOVE: + case MM_JOY2ZMOVE: + case MM_JOY1BUTTONDOWN: + case MM_JOY2BUTTONDOWN: + case MM_JOY1BUTTONUP: + case MM_JOY2BUTTONUP: + { + int x = LOWORD(lParam); + int y = HIWORD(lParam); + + processed = HandleJoystickEvent(message, x, y, wParam); + } break; - } - case MM_JOY2BUTTONDOWN: - { - int x = LOWORD(lParam); - int y = HIWORD(lParam); - MSWOnJoyDown(wxJOYSTICK2, x, y, wParam); + + case WM_DESTROY: + processed = MSWOnDestroy(); break; - } - case MM_JOY1BUTTONUP: - { - int x = LOWORD(lParam); - int y = HIWORD(lParam); - MSWOnJoyUp(wxJOYSTICK1, x, y, wParam); + + case WM_SYSCOMMAND: + processed = MSWOnSysCommand(wParam, lParam); break; - } - case MM_JOY2BUTTONUP: - { - int x = LOWORD(lParam); - int y = HIWORD(lParam); - MSWOnJoyUp(wxJOYSTICK2, x, y, wParam); + + case WM_COMMAND: + { +#ifdef __WIN32__ + WORD id = LOWORD(wParam); + HWND hwnd = (HWND)lParam; + WORD cmd = HIWORD(wParam); +#else + WORD id = (WORD)wParam; + HWND hwnd = (HWND)LOWORD(lParam) ; + WORD cmd = HIWORD(lParam); +#endif + processed = MSWOnCommand(id, cmd, (WXHWND)hwnd); + } break; - } - case MM_JOY1MOVE: - { - int x = LOWORD(lParam); - int y = HIWORD(lParam); - MSWOnJoyMove(wxJOYSTICK1, x, y, wParam); + +#ifdef __WIN95__ + case WM_NOTIFY: + processed = HandleNotify((int)wParam, lParam, &rc.result); break; - } - case MM_JOY2MOVE: - { - int x = LOWORD(lParam); - int y = HIWORD(lParam); - MSWOnJoyMove(wxJOYSTICK2, x, y, wParam); - break; - } - case MM_JOY1ZMOVE: - { - int z = LOWORD(lParam); - MSWOnJoyZMove(wxJOYSTICK1, z, wParam); - break; - } - case MM_JOY2ZMOVE: - { - int z = LOWORD(lParam); - MSWOnJoyZMove(wxJOYSTICK2, z, wParam); - break; - } - case WM_DESTROY: - { - if (MSWOnDestroy()) - return 0; - else return MSWDefWindowProc(message, wParam, lParam ); - break; - } - case WM_SYSCOMMAND: - { - return MSWOnSysCommand(wParam, lParam); - break; - } - case WM_COMMAND: - { -#ifdef __WIN32__ - WORD id = LOWORD(wParam); - HWND hwnd = (HWND)lParam; - WORD cmd = HIWORD(wParam); -#else - WORD id = (WORD)wParam; - HWND hwnd = (HWND)LOWORD(lParam) ; - WORD cmd = HIWORD(lParam); -#endif - if (!MSWOnCommand(id, cmd, (WXHWND) hwnd)) - return MSWDefWindowProc(message, wParam, lParam ); - break; - } -#if defined(__WIN95__) - case WM_NOTIFY: - { - // for some messages (TVN_ITEMEXPANDING for example), the return - // value of WM_NOTIFY handler is important, so don't just return 0 - // if we processed the message - return MSWOnNotify(wParam, lParam); - } -#endif - case WM_MENUSELECT: - { -#ifdef __WIN32__ - WORD flags = HIWORD(wParam); - HMENU sysmenu = (HMENU)lParam; -#else - WORD flags = LOWORD(lParam); - HMENU sysmenu = (HMENU)HIWORD(lParam); -#endif - MSWOnMenuHighlight((WORD)wParam, flags, (WXHMENU) sysmenu); - break; - } - case WM_INITMENUPOPUP: - { - MSWOnInitMenuPopup((WXHMENU) (HMENU)wParam, (int)LOWORD(lParam), (HIWORD(lParam) != 0)); - break; - } - case WM_DRAWITEM: - { - return MSWOnDrawItem((int)wParam, (WXDRAWITEMSTRUCT *)lParam); - break; - } - case WM_MEASUREITEM: - { - return MSWOnMeasureItem((int)wParam, (WXMEASUREITEMSTRUCT *)lParam); - break; - } +#endif // Win95 - case WM_KEYDOWN: - { - // If this has been processed by an event handler, - // return 0 now (we've handled it). - if (MSWOnKeyDown((WORD) wParam, lParam)) - { - return 0; - } + // for these messages we must return TRUE if process the message + case WM_DRAWITEM: + case WM_MEASUREITEM: + { + int idCtrl = (UINT)wParam; + if ( message == WM_DRAWITEM ) + { + processed = MSWOnDrawItem(idCtrl, + (WXDRAWITEMSTRUCT *)lParam); + } + else + { + processed = MSWOnMeasureItem(idCtrl, + (WXMEASUREITEMSTRUCT *)lParam); + } - // we consider these message "not interesting" to OnChar - if ( wParam == VK_SHIFT || wParam == VK_CONTROL ) - { - return Default(); - } + if ( processed ) + rc.result = TRUE; + } + break; + + case WM_KEYDOWN: + // If this has been processed by an event handler, + // return 0 now (we've handled it). + if ( MSWOnKeyDown((WORD) wParam, lParam) ) + { + processed = TRUE; - // Avoid duplicate messages to OnChar for these special keys - switch ( wParam ) - { - case VK_ESCAPE: - case VK_SPACE: - case VK_RETURN: - case VK_BACK: - case VK_TAB: - case VK_LEFT: - case VK_RIGHT: - case VK_DOWN: - case VK_UP: -/* -// if ( ::GetKeyState(VK_CONTROL) & 0x100 ) // Don't understand purpose of this test - if (!MSWOnChar((WORD)wParam, lParam)) - return Default(); break; -*/ - default: - if (!MSWOnChar((WORD)wParam, lParam)) - { - return Default(); - } -/* - if ( ::GetKeyState(VK_CONTROL) & 0x100 ) - return Default(); -*/ + } + + // we consider these message "not interesting" to OnChar + if ( wParam == VK_SHIFT || wParam == VK_CONTROL ) + { break; - } + } - break; - } - case WM_KEYUP: - { - if (!MSWOnKeyUp((WORD) wParam, lParam)) - return Default(); - break; - } - case WM_CHAR: // Always an ASCII character - { - if (!MSWOnChar((WORD)wParam, lParam, TRUE)) - return Default(); + switch ( wParam ) + { + // avoid duplicate messages to OnChar for these ASCII keys: they + // will be translated by TranslateMessage() and received in WM_CHAR + case VK_ESCAPE: + case VK_SPACE: + case VK_RETURN: + case VK_BACK: + case VK_TAB: + break; + +#ifdef VK_APPS + // special case of VK_APPS: treat it the same as right mouse + // click because both usually pop up a context menu + case VK_APPS: + { + // construct the key mask + WPARAM fwKeys = MK_RBUTTON; + if ( (::GetKeyState(VK_CONTROL) & 0x100) != 0 ) + fwKeys |= MK_CONTROL; + if ( (::GetKeyState(VK_SHIFT) & 0x100) != 0 ) + fwKeys |= MK_SHIFT; + + // simulate right mouse button click + DWORD dwPos = ::GetMessagePos(); + int x = GET_X_LPARAM(dwPos), + y = GET_Y_LPARAM(dwPos); + + ScreenToClient(&x, &y); + processed = MSWOnMouseEvent(WM_RBUTTONDOWN, x, y, fwKeys); + } + break; +#endif // VK_APPS + + case VK_LEFT: + case VK_RIGHT: + case VK_DOWN: + case VK_UP: + default: + processed = MSWOnChar((WORD)wParam, lParam); + } break; - } - case WM_HSCROLL: - { -#ifdef __WIN32__ - WORD code = LOWORD(wParam); - WORD pos = HIWORD(wParam); - HWND control = (HWND)lParam; -#else - WORD code = (WORD)wParam; - WORD pos = LOWORD(lParam); - HWND control = (HWND)HIWORD(lParam); -#endif - MSWOnHScroll(code, pos, (WXHWND) control); + case WM_KEYUP: + processed = MSWOnKeyUp((WORD) wParam, lParam); break; - } - case WM_VSCROLL: - { + + case WM_CHAR: // Always an ASCII character + processed = MSWOnChar((WORD)wParam, lParam, TRUE); + break; + + case WM_HSCROLL: + case WM_VSCROLL: + { #ifdef __WIN32__ - WORD code = LOWORD(wParam); - WORD pos = HIWORD(wParam); - HWND control = (HWND)lParam; + WORD code = LOWORD(wParam); + WORD pos = HIWORD(wParam); + HWND control = (HWND)lParam; #else - WORD code = (WORD)wParam; - WORD pos = LOWORD(lParam); - HWND control = (HWND)HIWORD(lParam); + WORD code = (WORD)wParam; + WORD pos = LOWORD(lParam); + HWND control = (HWND)HIWORD(lParam); #endif - MSWOnVScroll(code, pos, (WXHWND) control); + processed = MSWOnScroll(message == WM_HSCROLL ? wxHORIZONTAL + : wxVERTICAL, + code, pos, (WXHWND)control); + } break; - } + + // CTLCOLOR messages are sent by children to query the parent for their + // colors #ifdef __WIN32__ - case WM_CTLCOLORBTN: - { - int nCtlColor = CTLCOLOR_BTN; - HWND control = (HWND)lParam; - HDC pDC = (HDC)wParam; - return (DWORD)MSWOnCtlColor((WXHDC) pDC, (WXHWND) control, nCtlColor, - message, wParam, lParam); - break; - } - case WM_CTLCOLORDLG: - { - int nCtlColor = CTLCOLOR_DLG; - HWND control = (HWND)lParam; - HDC pDC = (HDC)wParam; - return (DWORD)MSWOnCtlColor((WXHDC) pDC, (WXHWND) control, nCtlColor, - message, wParam, lParam);\ + case WM_CTLCOLORMSGBOX: + case WM_CTLCOLOREDIT: + case WM_CTLCOLORLISTBOX: + case WM_CTLCOLORBTN: + case WM_CTLCOLORDLG: + case WM_CTLCOLORSCROLLBAR: + case WM_CTLCOLORSTATIC: + { + int nCtlColor = CTLCOLOR_BTN; + HWND control = (HWND)lParam; + HDC hdc = (HDC)wParam; + + processed = MSWOnCtlColor(&rc.hBrush, (WXHDC)hdc, (WXHWND)control, + nCtlColor, message, wParam, lParam); break; - } - case WM_CTLCOLORLISTBOX: - { - int nCtlColor = CTLCOLOR_LISTBOX; - HWND control = (HWND)lParam; - HDC pDC = (HDC)wParam; - return (DWORD)MSWOnCtlColor((WXHDC) pDC, (WXHWND) control, nCtlColor, - message, wParam, lParam); - break; - } - case WM_CTLCOLORMSGBOX: - { - int nCtlColor = CTLCOLOR_MSGBOX; - HWND control = (HWND)lParam; - HDC pDC = (HDC)wParam; - return (DWORD)MSWOnCtlColor((WXHDC) pDC, (WXHWND) control, nCtlColor, - message, wParam, lParam); - break; - } - case WM_CTLCOLORSCROLLBAR: - { - int nCtlColor = CTLCOLOR_SCROLLBAR; - HWND control = (HWND)lParam; - HDC pDC = (HDC)wParam; - return (DWORD)MSWOnCtlColor((WXHDC) pDC, (WXHWND) control, nCtlColor, - message, wParam, lParam); - break; - } - case WM_CTLCOLORSTATIC: - { - int nCtlColor = CTLCOLOR_STATIC; - HWND control = (HWND)lParam; - HDC pDC = (HDC)wParam; - return (DWORD)MSWOnCtlColor((WXHDC) pDC, (WXHWND) control, nCtlColor, - message, wParam, lParam); - break; - } - case WM_CTLCOLOREDIT: - { - int nCtlColor = CTLCOLOR_EDIT; - HWND control = (HWND)lParam; - HDC pDC = (HDC)wParam; - return (DWORD)MSWOnCtlColor((WXHDC) pDC, (WXHWND) control, nCtlColor, - message, wParam, lParam); - break; - } -#else - case WM_CTLCOLOR: - { - HWND control = (HWND)LOWORD(lParam); - int nCtlColor = (int)HIWORD(lParam); - HDC pDC = (HDC)wParam; - return (DWORD)MSWOnCtlColor((WXHDC) pDC, (WXHWND) control, nCtlColor, - message, wParam, lParam); - break; - } -#endif - case WM_SYSCOLORCHANGE: - { - // Return value of 0 means, we processed it. - if (MSWOnColorChange((WXHWND) hWnd, message, wParam, lParam) == 0) - return 0; - else - return MSWDefWindowProc(message, wParam, lParam ); + } +#else // Win16 + case WM_CTLCOLOR: + { + HWND control = (HWND)LOWORD(lParam); + int nCtlColor = (int)HIWORD(lParam); + HDC hdc = (HDC)wParam; + + processed = MSWOnCtlColor(&rc.hBrush, (WXHDC)hdc, (WXHWND)control, + nCtlColor, message, wParam, lParam); + } break; - } - case WM_PALETTECHANGED: - { - return MSWOnPaletteChanged((WXHWND) (HWND) wParam); +#endif // Win32/16 + + // the return value for this message is ignored + case WM_SYSCOLORCHANGE: + { + wxSysColourChangedEvent event; + event.SetEventObject(this); + + processed = GetEventHandler()->ProcessEvent(event); + } break; - } - case WM_QUERYNEWPALETTE: - { - return MSWOnQueryNewPalette(); + + case WM_PALETTECHANGED: + processed = MSWOnPaletteChanged((WXHWND) (HWND) wParam); break; - } - case WM_ERASEBKGND: - { - // Prevents flicker when dragging - if (IsIconic(hWnd)) return 1; - if (!MSWOnEraseBkgnd((WXHDC) (HDC)wParam)) - return 0; // Default(); MSWDefWindowProc(message, wParam, lParam ); - else return 1; + case WM_QUERYNEWPALETTE: + processed = MSWOnQueryNewPalette(); break; - } - case WM_MDIACTIVATE: - { + + // return TRUE if we erase the background + case WM_ERASEBKGND: + // Prevents flicker when dragging + if ( IsIconic(hWnd) ) return 1; + + if ( !MSWOnEraseBkgnd((WXHDC) (HDC)wParam) ) + return 0; + else return 1; + break; + + case WM_MDIACTIVATE: + { #ifdef __WIN32__ - HWND hWndActivate = GET_WM_MDIACTIVATE_HWNDACTIVATE(wParam,lParam); - HWND hWndDeactivate = GET_WM_MDIACTIVATE_HWNDDEACT(wParam,lParam); - BOOL activate = GET_WM_MDIACTIVATE_FACTIVATE(hWnd,wParam,lParam); - return MSWOnMDIActivate((long) activate, (WXHWND) hWndActivate, (WXHWND) hWndDeactivate); + HWND hWndActivate = GET_WM_MDIACTIVATE_HWNDACTIVATE(wParam,lParam); + HWND hWndDeactivate = GET_WM_MDIACTIVATE_HWNDDEACT(wParam,lParam); + BOOL activate = GET_WM_MDIACTIVATE_FACTIVATE(hWnd,wParam,lParam); + processed = MSWOnMDIActivate((long)activate, + (WXHWND)hWndActivate, + (WXHWND)hWndDeactivate); #else - return MSWOnMDIActivate((BOOL)wParam, (HWND)LOWORD(lParam), - (HWND)HIWORD(lParam)); + processed = MSWOnMDIActivate((BOOL)wParam, + (HWND)LOWORD(lParam), + (HWND)HIWORD(lParam)); #endif - } - case WM_DROPFILES: - { - MSWOnDropFiles(wParam); + } break; - } - case WM_INITDIALOG: - { - return 0; // MSWOnInitDialog((WXHWND)(HWND)wParam); + + case WM_DROPFILES: + processed = MSWOnDropFiles(wParam); break; - } - case WM_QUERYENDSESSION: - { - // Same as WM_CLOSE, but inverted results. Thx Microsoft :-) - // return MSWOnClose(); - return MSWOnQueryEndSession(lParam); + case WM_INITDIALOG: + wxFAIL_MSG("to fix"); + + return 0; // MSWOnInitDialog((WXHWND)(HWND)wParam); + + // we never set focus from here + rc.result = FALSE; break; - } - case WM_ENDSESSION: - { - // Same as WM_CLOSE, but inverted results. Thx Microsoft :-) - MSWOnEndSession((wParam != 0), lParam); - return 0L; + + case WM_QUERYENDSESSION: + processed = MSWOnQueryEndSession(lParam, &rc.allow); break; - } - case WM_CLOSE: - { - if (MSWOnClose()) - return 0L; - else - return 1L; + + case WM_ENDSESSION: + processed = MSWOnEndSession(wParam != 0, lParam); break; - } - case WM_GETMINMAXINFO: - { - MINMAXINFO *info = (MINMAXINFO *)lParam; - if (m_minSizeX != -1) - info->ptMinTrackSize.x = (int)m_minSizeX; - if (m_minSizeY != -1) - info->ptMinTrackSize.y = (int)m_minSizeY; - if (m_maxSizeX != -1) - info->ptMaxTrackSize.x = (int)m_maxSizeX; - if (m_maxSizeY != -1) - info->ptMaxTrackSize.y = (int)m_maxSizeY; - return MSWDefWindowProc(message, wParam, lParam ); + case WM_GETMINMAXINFO: + { + MINMAXINFO *info = (MINMAXINFO *)lParam; + if ( m_minWidth != -1 ) + info->ptMinTrackSize.x = m_minWidth; + if ( m_minHeight != -1 ) + info->ptMinTrackSize.y = m_minHeight; + if ( m_maxWidth != -1 ) + info->ptMaxTrackSize.x = m_maxWidth; + if ( m_maxHeight != -1 ) + info->ptMaxTrackSize.y = m_maxHeight; + } break; - } - case WM_GETDLGCODE: - return MSWGetDlgCode(); + case WM_SETCURSOR: + // don't set cursor for other windows, only for this one: this + // prevents children of this window from getting the same cursor as + // the parent has (don't forget that this message is propagated by + // default up the window parent-child hierarchy) + if ( (HWND)wParam == hWnd ) + { + // don't set cursor when the mouse is not in the client part + short nHitTest = LOWORD(lParam); + if ( nHitTest == HTCLIENT || nHitTest == HTERROR ) + { + HCURSOR hcursor = 0; + if ( wxIsBusy() ) + { + // from msw\utils.cpp + extern HCURSOR gs_wxBusyCursor; - default: - return MSWDefWindowProc(message, wParam, lParam ); + hcursor = gs_wxBusyCursor; + } + else + { + wxCursor *cursor = NULL; + + if ( m_cursor.Ok() ) + { + cursor = &m_cursor; + } + else + { + // from msw\data.cpp + extern wxCursor *g_globalCursor; + + if ( g_globalCursor && g_globalCursor->Ok() ) + cursor = g_globalCursor; + } + + if ( cursor ) + hcursor = (HCURSOR)cursor->GetHCURSOR(); + } + + if ( hcursor ) + { + ::SetCursor(hcursor); + + // returning TRUE stops the DefWindowProc() from + // further processing this message - exactly what we + // need because we've just set the cursor. + rc.result = TRUE; + processed = TRUE; + } + } + } + } + + if ( !processed ) + { +#ifdef __WXDEBUG__ + wxLogTrace(wxTraceMessages, "Forwarding %s to DefWindowProc.", + wxGetMessageName(message)); +#endif // __WXDEBUG__ + rc.result = MSWDefWindowProc(message, wParam, lParam); } - return 0; // Success: we processed this command. + return rc.result; } // Dialog window proc @@ -1498,7 +1264,7 @@ wxList *wxWinHandleList = NULL; wxWindow *wxFindWinFromHandle(WXHWND hWnd) { wxNode *node = wxWinHandleList->Find((long)hWnd); - if (!node) + if ( !node ) return NULL; return (wxWindow *)node->Data(); } @@ -1524,11 +1290,19 @@ void wxWindow::MSWDestroyWindow() { } -void wxWindow::MSWCreate(int id, wxWindow *parent, const char *wclass, wxWindow *wx_win, const char *title, - int x, int y, int width, int height, - WXDWORD style, const char *dialog_template, WXDWORD extendedStyle) +bool wxWindow::MSWCreate(int id, + wxWindow *parent, + const char *wclass, + wxWindow *wx_win, + const char *title, + int x, + int y, + int width, + int height, + WXDWORD style, + const char *dialog_template, + WXDWORD extendedStyle) { - bool is_dialog = (dialog_template != NULL); int x1 = CW_USEDEFAULT; int y1 = 0; int width1 = CW_USEDEFAULT; @@ -1537,120 +1311,111 @@ void wxWindow::MSWCreate(int id, wxWindow *parent, const char *wclass, wxWindow // Find parent's size, if it exists, to set up a possible default // panel size the size of the parent window RECT parent_rect; - if (parent) + if ( parent ) { - // Was GetWindowRect: JACS 5/5/95 ::GetClientRect((HWND) parent->GetHWND(), &parent_rect); width1 = parent_rect.right - parent_rect.left; height1 = parent_rect.bottom - parent_rect.top; } - if (x > -1) x1 = x; - if (y > -1) y1 = y; - if (width > -1) width1 = width; - if (height > -1) height1 = height; + if ( x > -1 ) x1 = x; + if ( y > -1 ) y1 = y; + if ( width > -1 ) width1 = width; + if ( height > -1 ) height1 = height; HWND hParent = NULL; - if (parent) + if ( parent ) hParent = (HWND) parent->GetHWND(); wxWndHook = this; - if (is_dialog) + if ( dialog_template ) { - // MakeProcInstance doesn't seem to be needed in C7. Is it needed for - // other compilers??? - // VZ: it's always needed for Win16 and never for Win32 -#ifdef __WIN32__ - m_hWnd = (WXHWND) ::CreateDialog(wxGetInstance(), dialog_template, hParent, - (DLGPROC)wxDlgProc); -#else - // N.B.: if we _don't_ use this form, - // then with VC++ 1.5, it crashes horribly. -#if 1 - m_hWnd = (WXHWND) ::CreateDialog(wxGetInstance(), dialog_template, hParent, - (DLGPROC)wxDlgProc); -#else - // Crashes when we use this. - DLGPROC dlgproc = (DLGPROC)MakeProcInstance((DLGPROC)wxWndProc, wxGetInstance()); + m_hWnd = (WXHWND)::CreateDialog(wxGetInstance(), + dialog_template, + hParent, + (DLGPROC)wxDlgProc); - m_hWnd = (WXHWND) ::CreateDialog(wxGetInstance(), dialog_template, hParent, - (DLGPROC)dlgproc); -#endif -#endif + if ( m_hWnd == 0 ) + { + wxLogError(_("Can't find dummy dialog template!\n" + "Check resource include path for finding wx.rc.")); - if (m_hWnd == 0) - MessageBox(NULL, "Can't find dummy dialog template!\nCheck resource include path for finding wx.rc.", - "wxWindows Error", MB_ICONEXCLAMATION | MB_OK); - else MoveWindow((HWND) m_hWnd, x1, y1, width1, height1, FALSE); + return FALSE; + } + + ::MoveWindow(GetHwnd(), x1, y1, width1, height1, FALSE); } else { int controlId = 0; - if (style & WS_CHILD) + if ( style & WS_CHILD ) controlId = id; - if (!title) - title = ""; - - m_hWnd = (WXHWND)CreateWindowEx(extendedStyle, wclass, - title, - style, - x1, y1, - width1, height1, - hParent, (HMENU)controlId, wxGetInstance(), - NULL); - - if ( !m_hWnd ) { - wxLogError("Can't create window of class %s!\n" - "Possible Windows 3.x compatibility problem?", wclass); + + m_hWnd = (WXHWND)CreateWindowEx(extendedStyle, + wclass, + title ? title : "", + style, + x1, y1, + width1, height1, + hParent, (HMENU)controlId, + wxGetInstance(), + NULL); + + if ( !m_hWnd ) + { + wxLogError(_("Can't create window of class %s!\n" + "Possible Windows 3.x compatibility problem?"), + wclass); + + return FALSE; } } wxWndHook = NULL; wxWinHandleList->Append((long)m_hWnd, this); -} -void wxWindow::MSWOnCreate(WXLPCREATESTRUCT WXUNUSED(cs)) -{ + return TRUE; } -bool wxWindow::MSWOnClose() +bool wxWindow::MSWOnCreate(WXLPCREATESTRUCT WXUNUSED(cs), bool *mayCreate) { - return FALSE; -} + *mayCreate = TRUE; -// Some compilers don't define this -#ifndef ENDSESSION_LOGOFF -#define ENDSESSION_LOGOFF 0x80000000 -#endif + return TRUE; +} -// Return TRUE to end session, FALSE to veto end session. -bool wxWindow::MSWOnQueryEndSession(long logOff) +bool wxWindow::MSWOnQueryEndSession(long logOff, bool *mayEnd) { wxCloseEvent event(wxEVT_QUERY_END_SESSION, -1); event.SetEventObject(wxTheApp); event.SetCanVeto(TRUE); - event.SetLoggingOff( (logOff == ENDSESSION_LOGOFF) ); - if ((this == wxTheApp->GetTopWindow()) && // Only send once - wxTheApp->ProcessEvent(event) && event.GetVeto()) - { - return FALSE; // Veto! - } - else + event.SetLoggingOff(logOff == ENDSESSION_LOGOFF); + + bool rc = wxTheApp->ProcessEvent(event); + + if ( rc ) { - return TRUE; // Don't veto + // we may end only if the app didn't veto session closing (double + // negation...) + *mayEnd = !event.GetVeto(); } + + return rc; } bool wxWindow::MSWOnEndSession(bool endSession, long logOff) { + // do nothing if the session isn't ending + if ( !endSession ) + return FALSE; + wxCloseEvent event(wxEVT_END_SESSION, -1); event.SetEventObject(wxTheApp); event.SetCanVeto(FALSE); event.SetLoggingOff( (logOff == ENDSESSION_LOGOFF) ); - if (endSession && // No need to send if the session isn't ending - (this == wxTheApp->GetTopWindow()) && // Only send once + if ( (this == wxTheApp->GetTopWindow()) && // Only send once wxTheApp->ProcessEvent(event)) { } @@ -1661,125 +1426,70 @@ bool wxWindow::MSWOnDestroy() { // delete our drop target if we've got one #if wxUSE_DRAG_AND_DROP - if ( m_pDropTarget != NULL ) { - m_pDropTarget->Revoke(m_hWnd); + if ( m_dropTarget != NULL ) { + m_dropTarget->Revoke(m_hWnd); - delete m_pDropTarget; - m_pDropTarget = NULL; + delete m_dropTarget; + m_dropTarget = NULL; } #endif return TRUE; } -// Deal with child commands from buttons etc. +bool wxWindow::MSWOnMDIActivate(long WXUNUSED(flag), + WXHWND WXUNUSED(activate), + WXHWND WXUNUSED(deactivate)) +{ + return FALSE; +} -long wxWindow::MSWOnNotify(WXWPARAM wParam, WXLPARAM lParam) +bool wxWindow::MSWOnActivate(int state, bool WXUNUSED(minimized), WXHWND WXUNUSED(activate)) { -#if defined(__WIN95__) - // Find a child window to send the notification to, e.g. a toolbar. - // There's a problem here. NMHDR::hwndFrom doesn't give us the - // handle of the toolbar; it's probably the handle of the tooltip - // window (anyway, it's parent is also the toolbar's parent). - // So, since we don't know which hWnd or wxWindow originated the - // WM_NOTIFY, we'll need to go through all the children of this window - // trying out MSWNotify. - // This won't work now, though, because any number of controls - // could respond to the same generic messages :-( - - /* This doesn't work for toolbars, but try for other controls first. - */ - NMHDR *hdr = (NMHDR *)lParam; - HWND hWnd = (HWND)hdr->hwndFrom; - wxWindow *win = wxFindWinFromHandle((WXHWND) hWnd); + wxActivateEvent event(wxEVT_ACTIVATE, + (state == WA_ACTIVE) || (state == WA_CLICKACTIVE), + m_windowId); + event.SetEventObject(this); - WXLPARAM result = 0; + return GetEventHandler()->ProcessEvent(event); +} - if ( win ) +bool wxWindow::MSWOnSetFocus(WXHWND WXUNUSED(hwnd)) +{ + // Deal with caret + if ( m_caretEnabled && (m_caretWidth > 0) && (m_caretHeight > 0) ) { - if ( win->MSWNotify(wParam, lParam, &result) ) - return result; - } - else - { - // Rely on MSWNotify to check whether the message - // belongs to the window or not - wxNode *node = GetChildren().First(); - while (node) - { - wxWindow *child = (wxWindow *)node->Data(); - if ( child->MSWNotify(wParam, lParam, &result) ) - return result; - node = node->Next(); - } - - // finally try this window too (catches toolbar case) - if ( MSWNotify(wParam, lParam, &result) ) - return result; - } -#endif // Win95 - - // not processed - return FALSE; -} - -void wxWindow::MSWOnMenuHighlight(WXWORD WXUNUSED(item), WXWORD WXUNUSED(flags), WXHMENU WXUNUSED(sysmenu)) -{ -} - -void wxWindow::MSWOnInitMenuPopup(WXHMENU menu, int pos, bool isSystem) -{ -} - -bool wxWindow::MSWOnActivate(int state, bool WXUNUSED(minimized), WXHWND WXUNUSED(activate)) -{ - wxActivateEvent event(wxEVT_ACTIVATE, ((state == WA_ACTIVE) || (state == WA_CLICKACTIVE)), - m_windowId); - event.SetEventObject(this); - GetEventHandler()->ProcessEvent(event); - return 0; -} - -bool wxWindow::MSWOnSetFocus(WXHWND WXUNUSED(hwnd)) -{ - // Deal with caret - if (m_caretEnabled && (m_caretWidth > 0) && (m_caretHeight > 0)) - { - ::CreateCaret((HWND) GetHWND(), NULL, m_caretWidth, m_caretHeight); - if (m_caretShown) - ::ShowCaret((HWND) GetHWND()); + ::CreateCaret(GetHwnd(), NULL, m_caretWidth, m_caretHeight); + if ( m_caretShown ) + ::ShowCaret(GetHwnd()); } // panel wants to track the window which was the last to have focus in it wxWindow *parent = GetParent(); if ( parent && parent->IsKindOf(CLASSINFO(wxPanel)) ) { - ((wxPanel *)parent)->SetLastFocus(this); + ((wxPanel *)parent)->SetLastFocus(GetId()); } wxFocusEvent event(wxEVT_SET_FOCUS, m_windowId); event.SetEventObject(this); - if (!GetEventHandler()->ProcessEvent(event)) - Default(); - return TRUE; + return GetEventHandler()->ProcessEvent(event); } bool wxWindow::MSWOnKillFocus(WXHWND WXUNUSED(hwnd)) { // Deal with caret - if (m_caretEnabled) + if ( m_caretEnabled ) { ::DestroyCaret(); } wxFocusEvent event(wxEVT_KILL_FOCUS, m_windowId); event.SetEventObject(this); - if (!GetEventHandler()->ProcessEvent(event)) - Default(); - return TRUE; + return GetEventHandler()->ProcessEvent(event); } -void wxWindow::MSWOnDropFiles(WXWPARAM wParam) +bool wxWindow::MSWOnDropFiles(WXWPARAM wParam) { HDROP hFilesInfo = (HDROP) wParam; @@ -1805,10 +1515,11 @@ void wxWindow::MSWOnDropFiles(WXWPARAM wParam) event.m_eventObject = this; event.m_pos.x = dropPoint.x; event.m_pos.x = dropPoint.y; - if (!GetEventHandler()->ProcessEvent(event)) - Default(); + bool rc = GetEventHandler()->ProcessEvent(event); delete[] files; + + return rc; } bool wxWindow::MSWOnDrawItem(int id, WXDRAWITEMSTRUCT *itemStruct) @@ -1835,7 +1546,7 @@ bool wxWindow::MSWOnDrawItem(int id, WXDRAWITEMSTRUCT *itemStruct) wxWindow *item = FindItem(id); #if wxUSE_DYNAMIC_CLASSES - if (item && item->IsKindOf(CLASSINFO(wxControl))) + if ( item && item->IsKindOf(CLASSINFO(wxControl)) ) { return ((wxControl *)item)->MSWOnDraw(itemStruct); } @@ -1859,7 +1570,7 @@ bool wxWindow::MSWOnMeasureItem(int id, WXMEASUREITEMSTRUCT *itemStruct) wxWindow *item = FindItem(id); #if wxUSE_DYNAMIC_CLASSES - if (item && item->IsKindOf(CLASSINFO(wxControl))) + if ( item && item->IsKindOf(CLASSINFO(wxControl)) ) { return ((wxControl *)item)->MSWOnMeasure(itemStruct); } @@ -1868,68 +1579,59 @@ bool wxWindow::MSWOnMeasureItem(int id, WXMEASUREITEMSTRUCT *itemStruct) return FALSE; } -WXHBRUSH wxWindow::MSWOnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor, - WXUINT message, WXWPARAM wParam, WXLPARAM lParam) +bool wxWindow::MSWOnCtlColor(WXHBRUSH *brush, + WXHDC pDC, + WXHWND pWnd, + WXUINT nCtlColor, + WXUINT message, + WXWPARAM wParam, + WXLPARAM lParam) { - if (nCtlColor == CTLCOLOR_DLG) - { - return OnCtlColor(pDC, pWnd, nCtlColor, message, wParam, lParam); - } - - wxControl *item = (wxControl *)FindItemByHWND(pWnd, TRUE); - WXHBRUSH hBrush = 0; - if ( item ) - hBrush = item->OnCtlColor(pDC, pWnd, nCtlColor, message, wParam, lParam); + if ( nCtlColor == CTLCOLOR_DLG ) + { + hBrush = OnCtlColor(pDC, pWnd, nCtlColor, message, wParam, lParam); + } + else + { + wxControl *item = (wxControl *)FindItemByHWND(pWnd, TRUE); + if ( item ) + hBrush = item->OnCtlColor(pDC, pWnd, nCtlColor, message, wParam, lParam); + } - // I think that even for dialogs, we may need to call DefWindowProc (?) - // Or maybe just rely on the usual default behaviour. - if ( !hBrush ) - hBrush = (WXHBRUSH) MSWDefWindowProc(message, wParam, lParam); + if ( hBrush ) + *brush = hBrush; - return hBrush ; + return hBrush != 0; } // Define for each class of dialog and control -WXHBRUSH wxWindow::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor, - WXUINT message, WXWPARAM wParam, WXLPARAM lParam) +WXHBRUSH wxWindow::OnCtlColor(WXHDC hDC, + WXHWND hWnd, + WXUINT nCtlColor, + WXUINT message, + WXWPARAM wParam, + WXLPARAM lParam) { - return (WXHBRUSH) MSWDefWindowProc(message, wParam, lParam); -} - -bool wxWindow::MSWOnColorChange(WXHWND hWnd, WXUINT message, WXWPARAM wParam, WXLPARAM lParam) -{ - wxSysColourChangedEvent event; - event.SetEventObject(this); - - // Check if app handles this. - if (GetEventHandler()->ProcessEvent(event)) - return 0; - - // We didn't process it - return 1; + return (WXHBRUSH)0; } -long wxWindow::MSWOnPaletteChanged(WXHWND hWndPalChange) +bool wxWindow::MSWOnPaletteChanged(WXHWND hWndPalChange) { wxPaletteChangedEvent event(GetId()); event.SetEventObject(this); event.SetChangedWindow(wxFindWinFromHandle(hWndPalChange)); - GetEventHandler()->ProcessEvent(event); - return 0; + + return GetEventHandler()->ProcessEvent(event); } -long wxWindow::MSWOnQueryNewPalette() +bool wxWindow::MSWOnQueryNewPalette() { wxQueryNewPaletteEvent event(GetId()); event.SetEventObject(this); - if (!GetEventHandler()->ProcessEvent(event) || !event.GetPaletteRealized()) - { - return (long) FALSE; - } - else - return (long) TRUE; + + return GetEventHandler()->ProcessEvent(event) && event.GetPaletteRealized(); } // Responds to colour changes: passes event on to children. @@ -1954,28 +1656,15 @@ void wxWindow::OnSysColourChanged(wxSysColourChangedEvent& event) long wxWindow::MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) { if ( m_oldWndProc ) - return ::CallWindowProc(CASTWNDPROC m_oldWndProc, (HWND) GetHWND(), (UINT) nMsg, (WPARAM) wParam, (LPARAM) lParam); + return ::CallWindowProc(CASTWNDPROC m_oldWndProc, GetHwnd(), (UINT) nMsg, (WPARAM) wParam, (LPARAM) lParam); else - return ::DefWindowProc((HWND) GetHWND(), nMsg, wParam, lParam); -} - -long wxWindow::Default() -{ - // Ignore 'fake' events (perhaps generated as a result of a separate real event) - if (m_lastMsg == 0) - return 0; - -#ifdef __WXDEBUG__ - wxLogTrace(wxTraceMessages, "Forwarding %s to DefWindowProc.", - wxGetMessageName(m_lastMsg)); -#endif // __WXDEBUG__ - - return this->MSWDefWindowProc(m_lastMsg, m_lastWParam, m_lastLParam); + return ::DefWindowProc(GetHwnd(), nMsg, wParam, lParam); } bool wxWindow::MSWProcessMessage(WXMSG* pMsg) { - if ( m_hWnd != 0 && (GetWindowStyleFlag() & wxTAB_TRAVERSAL) ) { + if ( m_hWnd != 0 && (GetWindowStyleFlag() & wxTAB_TRAVERSAL) ) + { // intercept dialog navigation keys MSG *msg = (MSG *)pMsg; bool bProcess = TRUE; @@ -2037,7 +1726,7 @@ bool wxWindow::MSWProcessMessage(WXMSG* pMsg) // it return FALSE; } - +#ifndef __WIN16__ wxButton *btnDefault = GetDefaultItem(); if ( btnDefault && !bCtrlDown ) { @@ -2050,6 +1739,7 @@ bool wxWindow::MSWProcessMessage(WXMSG* pMsg) // else: but if there is not it makes sense to make it // work like a TAB - and that's what we do. // Note that Ctrl-Enter always works this way. +#endif } break; @@ -2069,9 +1759,10 @@ bool wxWindow::MSWProcessMessage(WXMSG* pMsg) } } - if ( ::IsDialogMessage((HWND)GetHWND(), msg) ) + if ( ::IsDialogMessage(GetHwnd(), msg) ) return TRUE; } + #if wxUSE_TOOLTIPS if ( m_tooltip ) { @@ -2082,26 +1773,34 @@ bool wxWindow::MSWProcessMessage(WXMSG* pMsg) } #endif // wxUSE_TOOLTIPS +/* This code manages to disable character input completely. Nice one! + * Probably because the dialog is requesting all char input. Or, + * it gets called by non-dialog windows. + + // In case we don't have wxTAB_TRAVERSAL style on. + // If we don't call this, we may never process Enter correctly. + if ( m_hWnd != 0 && (GetWindowStyleFlag() & wxTAB_TRAVERSAL) == 0 ) + { + MSG *msg = (MSG *)pMsg; + if ( ::IsDialogMessage(GetHwnd(), msg) ) + return TRUE; + } +*/ return FALSE; } bool wxWindow::MSWTranslateMessage(WXMSG* pMsg) { - if (m_acceleratorTable.Ok() && - ::TranslateAccelerator((HWND) GetHWND(), (HACCEL) m_acceleratorTable.GetHACCEL(), (MSG *)pMsg)) + if ( m_acceleratorTable.Ok( ) && + ::TranslateAccelerator(GetHwnd(), (HACCEL) m_acceleratorTable.GetHACCEL(), (MSG *)pMsg)) return TRUE; else return FALSE; } -long wxWindow::MSWOnMDIActivate(long WXUNUSED(flag), WXHWND WXUNUSED(activate), WXHWND WXUNUSED(deactivate)) -{ - return 1; -} - void wxWindow::MSWDetachWindowMenu() { - if (m_hMenu) + if ( m_hMenu ) { int N = GetMenuItemCount((HMENU) m_hMenu); int i; @@ -2109,7 +1808,7 @@ void wxWindow::MSWDetachWindowMenu() { char buf[100]; int chars = GetMenuString((HMENU) m_hMenu, i, buf, 100, MF_BYPOSITION); - if ((chars > 0) && (strcmp(buf, "&Window") == 0)) + if ( (chars > 0) && (strcmp(buf, "&Window") == 0) ) { RemoveMenu((HMENU) m_hMenu, i, MF_BYPOSITION); break; @@ -2122,12 +1821,12 @@ bool wxWindow::MSWOnPaint() { #ifdef __WIN32__ HRGN hRegion = ::CreateRectRgn(0, 0, 0, 0); // Dummy call to get a handle - ::GetUpdateRgn((HWND) GetHWND(), hRegion, FALSE); + ::GetUpdateRgn(GetHwnd(), hRegion, FALSE); m_updateRegion = wxRegion((WXHRGN) hRegion); #else RECT updateRect; - ::GetUpdateRect((HWND) GetHWND(), & updateRect, FALSE); + ::GetUpdateRect(GetHwnd(), & updateRect, FALSE); m_updateRegion = wxRegion(updateRect.left, updateRect.top, updateRect.right - updateRect.left, updateRect.bottom - updateRect.top); @@ -2135,38 +1834,34 @@ bool wxWindow::MSWOnPaint() wxPaintEvent event(m_windowId); event.SetEventObject(this); - if (!GetEventHandler()->ProcessEvent(event)) - Default(); - return TRUE; + return GetEventHandler()->ProcessEvent(event); } -void wxWindow::MSWOnSize(int w, int h, WXUINT WXUNUSED(flag)) +bool wxWindow::HandleMove(int x, int y) { - if (m_inOnSize) - return; - - if (!m_hWnd) - return; + wxMoveEvent event(wxPoint(x, y), m_windowId); + event.SetEventObject(this); - m_inOnSize = TRUE; + return GetEventHandler()->ProcessEvent(event); +} +bool wxWindow::MSWOnSize(int w, int h, WXUINT WXUNUSED(flag)) +{ wxSizeEvent event(wxSize(w, h), m_windowId); event.SetEventObject(this); - if (!GetEventHandler()->ProcessEvent(event)) - Default(); - m_inOnSize = FALSE; + return GetEventHandler()->ProcessEvent(event); } -void wxWindow::MSWOnWindowPosChanging(void *WXUNUSED(lpPos)) +bool wxWindow::MSWOnWindowPosChanging(void *WXUNUSED(lpPos)) { - Default(); + return FALSE; } // Deal with child commands from buttons etc. bool wxWindow::MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND control) { - if (wxCurrentPopupMenu) + if ( wxCurrentPopupMenu ) { wxMenu *popupMenu = wxCurrentPopupMenu; wxCurrentPopupMenu = NULL; @@ -2175,7 +1870,7 @@ bool wxWindow::MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND control) } wxWindow *item = FindItem(id); - if (item) + if ( item ) { bool value = item->MSWCommand(cmd, id); return value; @@ -2183,161 +1878,45 @@ bool wxWindow::MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND control) else { wxWindow *win = wxFindWinFromHandle(control); - if (win) + if ( win ) return win->MSWCommand(cmd, id); } return FALSE; } -long wxWindow::MSWOnSysCommand(WXWPARAM wParam, WXLPARAM lParam) +bool wxWindow::MSWOnSysCommand(WXWPARAM wParam, WXLPARAM lParam) { - switch (wParam) + // 4 bits are reserved + switch (wParam & 0xFFFFFFF0) { - case SC_MAXIMIZE: - { - wxMaximizeEvent event(m_windowId); - event.SetEventObject(this); - if (!GetEventHandler()->ProcessEvent(event)) - return Default(); - else - return 0; - break; - } - case SC_MINIMIZE: - { - wxIconizeEvent event(m_windowId); - event.SetEventObject(this); - if (!GetEventHandler()->ProcessEvent(event)) - return Default(); - else - return 0; - break; - } - default: - return Default(); - } - return 0; -} - -void wxWindow::MSWOnLButtonDown(int x, int y, WXUINT flags) -{ - wxMouseEvent event(wxEVT_LEFT_DOWN); - - 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.m_eventObject = this; - - m_lastXPos = event.m_x; m_lastYPos = event.m_y; m_lastEvent = wxEVT_LEFT_DOWN; - - if (!GetEventHandler()->ProcessEvent(event)) - Default(); -} - -void wxWindow::MSWOnLButtonUp(int x, int y, WXUINT flags) -{ - wxMouseEvent event(wxEVT_LEFT_UP); - - 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.m_eventObject = this; - - m_lastXPos = event.m_x; m_lastYPos = event.m_y; m_lastEvent = wxEVT_LEFT_UP; - - if (!GetEventHandler()->ProcessEvent(event)) - Default(); -} - -void wxWindow::MSWOnLButtonDClick(int x, int y, WXUINT flags) -{ - wxMouseEvent event(wxEVT_LEFT_DCLICK); - - 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.m_eventObject = this; - - m_lastXPos = event.m_x; m_lastYPos = event.m_y; m_lastEvent = wxEVT_LEFT_DCLICK; - - if (!GetEventHandler()->ProcessEvent(event)) - Default(); -} - -void wxWindow::MSWOnMButtonDown(int x, int y, WXUINT flags) -{ - wxMouseEvent event(wxEVT_MIDDLE_DOWN); - - 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.m_eventObject = this; - - m_lastXPos = event.m_x; m_lastYPos = event.m_y; m_lastEvent = wxEVT_MIDDLE_DOWN; - - if (!GetEventHandler()->ProcessEvent(event)) - Default(); -} + case SC_MAXIMIZE: + { + wxMaximizeEvent event(m_windowId); + event.SetEventObject(this); -void wxWindow::MSWOnMButtonUp(int x, int y, WXUINT flags) -{ - wxMouseEvent event(wxEVT_MIDDLE_UP); + return GetEventHandler()->ProcessEvent(event); + } - 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.m_eventObject = this; + case SC_MINIMIZE: + { + wxIconizeEvent event(m_windowId); + event.SetEventObject(this); - m_lastXPos = event.m_x; m_lastYPos = event.m_y; m_lastEvent = wxEVT_MIDDLE_UP; + return GetEventHandler()->ProcessEvent(event); + } + } - if (!GetEventHandler()->ProcessEvent(event)) - Default(); + return FALSE; } -void wxWindow::MSWOnMButtonDClick(int x, int y, WXUINT flags) -{ - wxMouseEvent event(wxEVT_MIDDLE_DCLICK); - - 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.m_eventObject = this; - - m_lastXPos = event.m_x; m_lastYPos = event.m_y; m_lastEvent = wxEVT_MIDDLE_DCLICK; - - if (!GetEventHandler()->ProcessEvent(event)) - Default(); -} +// --------------------------------------------------------------------------- +// mouse events +// --------------------------------------------------------------------------- -void wxWindow::MSWOnRButtonDown(int x, int y, WXUINT flags) +void wxWindow::InitMouseEvent(wxMouseEvent& event, int x, int y, WXUINT flags) { - wxMouseEvent event(wxEVT_RIGHT_DOWN); - - event.m_x = x; event.m_y = 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); @@ -2346,145 +1925,86 @@ void wxWindow::MSWOnRButtonDown(int x, int y, WXUINT flags) event.SetTimestamp(wxApp::sm_lastMessageTime); event.m_eventObject = this; - m_lastXPos = event.m_x; m_lastYPos = event.m_y; m_lastEvent = wxEVT_RIGHT_DOWN; - - if (!GetEventHandler()->ProcessEvent(event)) - Default(); -} - -void wxWindow::MSWOnRButtonUp(int x, int y, WXUINT flags) -{ - wxMouseEvent event(wxEVT_RIGHT_UP); - - 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.m_eventObject = this; - event.SetTimestamp(wxApp::sm_lastMessageTime); - - m_lastXPos = event.m_x; m_lastYPos = event.m_y; m_lastEvent = wxEVT_RIGHT_UP; +#if wxUSE_MOUSEEVENT_HACK + m_lastMouseX = x; + m_lastMouseY = y; + m_lastMouseEvent = event.GetEventType(); +#endif // wxUSE_MOUSEEVENT_HACK - if (!GetEventHandler()->ProcessEvent(event)) - Default(); } -void wxWindow::MSWOnRButtonDClick(int x, int y, WXUINT flags) +bool wxWindow::MSWOnMouseEvent(WXUINT msg, int x, int y, WXUINT flags) { - wxMouseEvent event(wxEVT_RIGHT_DCLICK); - - 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.m_eventObject = this; + // the mouse events take consecutive IDs from WM_MOUSEFIRST to + // WM_MOUSELAST, so it's enough to substract WM_MOUSEMOVE == WM_MOUSEFIRST + // from the message id and take the value in the table to get wxWin event + // id + static const wxEventType eventsMouse[] = + { + wxEVT_MOTION, + wxEVT_LEFT_DOWN, + wxEVT_LEFT_UP, + wxEVT_LEFT_DCLICK, + wxEVT_RIGHT_DOWN, + wxEVT_RIGHT_UP, + wxEVT_RIGHT_DCLICK, + wxEVT_MIDDLE_DOWN, + wxEVT_MIDDLE_UP, + wxEVT_MIDDLE_DCLICK + }; - m_lastXPos = event.m_x; m_lastYPos = event.m_y; m_lastEvent = wxEVT_RIGHT_DCLICK; + wxMouseEvent event(eventsMouse[msg - WM_MOUSEMOVE]); + InitMouseEvent(event, x, y, flags); - if (!GetEventHandler()->ProcessEvent(event)) - Default(); + return GetEventHandler()->ProcessEvent(event); } -void wxWindow::MSWOnMouseMove(int x, int y, WXUINT flags) +bool wxWindow::MSWOnMouseMove(int x, int y, 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((HCURSOR) m_windowCursor.GetHCURSOR()); - - if (!m_mouseInWindow) + if ( !m_mouseInWindow ) { // Generate an ENTER event m_mouseInWindow = TRUE; - MSWOnMouseEnter(x, y, flags); - } - 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.m_eventObject = this; + wxMouseEvent event(wxEVT_ENTER_WINDOW); + InitMouseEvent(event, x, y, flags); - // 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.m_x && m_lastYPos == event.m_y)) - { - m_lastXPos = event.m_x; m_lastYPos = event.m_y; - m_lastEvent = wxEVT_MOTION; - return; + (void)GetEventHandler()->ProcessEvent(event); } - m_lastEvent = wxEVT_MOTION; - m_lastXPos = event.m_x; m_lastYPos = event.m_y; - - if (!GetEventHandler()->ProcessEvent(event)) - Default(); -} - -void wxWindow::MSWOnMouseEnter(int x, int y, WXUINT flags) -{ - wxMouseEvent event(wxEVT_ENTER_WINDOW); +#if wxUSE_MOUSEEVENT_HACK + // 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_lastMouseEvent == wxEVT_RIGHT_DOWN || + m_lastMouseEvent == wxEVT_LEFT_DOWN || + m_lastMouseEvent == wxEVT_MIDDLE_DOWN) && + (m_lastMouseX == event.m_x && m_lastMouseY == event.m_y) ) + { + m_lastMouseEvent = 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.m_eventObject = this; + return FALSE; + } +#endif // wxUSE_MOUSEEVENT_HACK - m_lastEvent = wxEVT_ENTER_WINDOW; - m_lastXPos = event.m_x; m_lastYPos = event.m_y; - // No message - ensure we don't try to call the default behaviour accidentally. - m_lastMsg = 0; - GetEventHandler()->ProcessEvent(event); + return MSWOnMouseEvent(WM_MOUSEMOVE, x, y, flags); } -void wxWindow::MSWOnMouseLeave(int x, int y, WXUINT flags) -{ - wxMouseEvent event(wxEVT_LEAVE_WINDOW); - - 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.m_eventObject = this; - - m_lastEvent = wxEVT_LEAVE_WINDOW; - m_lastXPos = event.m_x; m_lastYPos = event.m_y; - // No message - ensure we don't try to call the default behaviour accidentally. - m_lastMsg = 0; - GetEventHandler()->ProcessEvent(event); -} +// --------------------------------------------------------------------------- +// keyboard handling +// --------------------------------------------------------------------------- +// isASCII is TRUE only when we're called from WM_CHAR handler and not from +// WM_KEYDOWN one bool wxWindow::MSWOnChar(WXWORD wParam, WXLPARAM lParam, bool isASCII) { int id; bool tempControlDown = FALSE; - if (isASCII) + if ( isASCII ) { // If 1 -> 26, translate to CTRL plus a letter. id = wParam; - if ((id > 0) && (id < 27)) + if ( (id > 0) && (id < 27) ) { switch (id) { @@ -2511,18 +2031,18 @@ bool wxWindow::MSWOnChar(WXWORD wParam, WXLPARAM lParam, bool isASCII) } } } - else if ((id = wxCharCodeMSWToWX(wParam)) == 0) { + else if ( (id = wxCharCodeMSWToWX(wParam)) == 0 ) { // it's ASCII and will be processed here only when called from // WM_CHAR (i.e. when isASCII = TRUE) id = -1; } - if (id != -1) + if ( id != -1 ) { wxKeyEvent event(wxEVT_CHAR); event.m_shiftDown = (::GetKeyState(VK_SHIFT)&0x100?TRUE:FALSE); event.m_controlDown = (::GetKeyState(VK_CONTROL)&0x100?TRUE:FALSE); - if ((HIWORD(lParam) & KF_ALTDOWN) == KF_ALTDOWN) + if ( (HIWORD(lParam) & KF_ALTDOWN) == KF_ALTDOWN ) event.m_altDown = TRUE; event.m_eventObject = this; @@ -2532,13 +2052,13 @@ bool wxWindow::MSWOnChar(WXWORD wParam, WXLPARAM lParam, bool isASCII) POINT pt ; GetCursorPos(&pt) ; RECT rect ; - GetWindowRect((HWND) GetHWND(),&rect) ; + GetWindowRect(GetHwnd(),&rect) ; pt.x -= rect.left ; pt.y -= rect.top ; event.m_x = pt.x; event.m_y = pt.y; - if (GetEventHandler()->ProcessEvent(event)) + if ( GetEventHandler()->ProcessEvent(event) ) return TRUE; else return FALSE; @@ -2547,20 +2067,20 @@ bool wxWindow::MSWOnChar(WXWORD wParam, WXLPARAM lParam, bool isASCII) return FALSE; } -bool wxWindow::MSWOnKeyDown(WXWORD wParam, WXLPARAM lParam, bool isASCII) +bool wxWindow::MSWOnKeyDown(WXWORD wParam, WXLPARAM lParam) { int id; - if ((id = wxCharCodeMSWToWX(wParam)) == 0) { + if ( (id = wxCharCodeMSWToWX(wParam)) == 0 ) { id = wParam; } - if (id != -1) + if ( id != -1 ) { wxKeyEvent event(wxEVT_KEY_DOWN); event.m_shiftDown = (::GetKeyState(VK_SHIFT)&0x100?TRUE:FALSE); event.m_controlDown = (::GetKeyState(VK_CONTROL)&0x100?TRUE:FALSE); - if ((HIWORD(lParam) & KF_ALTDOWN) == KF_ALTDOWN) + if ( (HIWORD(lParam) & KF_ALTDOWN) == KF_ALTDOWN ) event.m_altDown = TRUE; event.m_eventObject = this; @@ -2570,13 +2090,13 @@ bool wxWindow::MSWOnKeyDown(WXWORD wParam, WXLPARAM lParam, bool isASCII) POINT pt ; GetCursorPos(&pt) ; RECT rect ; - GetWindowRect((HWND) GetHWND(),&rect) ; + GetWindowRect(GetHwnd(),&rect) ; pt.x -= rect.left ; pt.y -= rect.top ; event.m_x = pt.x; event.m_y = pt.y; - if (GetEventHandler()->ProcessEvent(event)) + if ( GetEventHandler()->ProcessEvent(event) ) { return TRUE; } @@ -2588,20 +2108,20 @@ bool wxWindow::MSWOnKeyDown(WXWORD wParam, WXLPARAM lParam, bool isASCII) } } -bool wxWindow::MSWOnKeyUp(WXWORD wParam, WXLPARAM lParam, bool isASCII) +bool wxWindow::MSWOnKeyUp(WXWORD wParam, WXLPARAM lParam) { int id; - if ((id = wxCharCodeMSWToWX(wParam)) == 0) { + if ( (id = wxCharCodeMSWToWX(wParam)) == 0 ) { id = wParam; } - if (id != -1) + if ( id != -1 ) { wxKeyEvent event(wxEVT_KEY_UP); event.m_shiftDown = (::GetKeyState(VK_SHIFT)&0x100?TRUE:FALSE); event.m_controlDown = (::GetKeyState(VK_CONTROL)&0x100?TRUE:FALSE); - if ((HIWORD(lParam) & KF_ALTDOWN) == KF_ALTDOWN) + if ( (HIWORD(lParam) & KF_ALTDOWN) == KF_ALTDOWN ) event.m_altDown = TRUE; event.m_eventObject = this; @@ -2611,13 +2131,13 @@ bool wxWindow::MSWOnKeyUp(WXWORD wParam, WXLPARAM lParam, bool isASCII) POINT pt ; GetCursorPos(&pt) ; RECT rect ; - GetWindowRect((HWND) GetHWND(),&rect) ; + GetWindowRect(GetHwnd(),&rect) ; pt.x -= rect.left ; pt.y -= rect.top ; event.m_x = pt.x; event.m_y = pt.y; - if (GetEventHandler()->ProcessEvent(event)) + if ( GetEventHandler()->ProcessEvent(event) ) return TRUE; else return FALSE; @@ -2626,115 +2146,103 @@ bool wxWindow::MSWOnKeyUp(WXWORD wParam, WXLPARAM lParam, bool isASCII) return FALSE; } -void wxWindow::MSWOnJoyDown(int joystick, int x, int y, WXUINT flags) +// --------------------------------------------------------------------------- +// joystick +// --------------------------------------------------------------------------- + +bool wxWindow::HandleJoystickEvent(WXUINT msg, int x, int y, WXUINT flags) { - int buttons = 0; int change = 0; - if (flags & JOY_BUTTON1CHG) + if ( flags & JOY_BUTTON1CHG ) change = wxJOY_BUTTON1; - if (flags & JOY_BUTTON2CHG) + if ( flags & JOY_BUTTON2CHG ) change = wxJOY_BUTTON2; - if (flags & JOY_BUTTON3CHG) + if ( flags & JOY_BUTTON3CHG ) change = wxJOY_BUTTON3; - if (flags & JOY_BUTTON4CHG) + if ( flags & JOY_BUTTON4CHG ) change = wxJOY_BUTTON4; - if (flags & JOY_BUTTON1) + int buttons = 0; + if ( flags & JOY_BUTTON1 ) buttons |= wxJOY_BUTTON1; - if (flags & JOY_BUTTON2) + if ( flags & JOY_BUTTON2 ) buttons |= wxJOY_BUTTON2; - if (flags & JOY_BUTTON3) + if ( flags & JOY_BUTTON3 ) buttons |= wxJOY_BUTTON3; - if (flags & JOY_BUTTON4) + if ( flags & JOY_BUTTON4 ) buttons |= wxJOY_BUTTON4; - wxJoystickEvent event(wxEVT_JOY_BUTTON_DOWN, buttons, joystick, change); - event.SetPosition(wxPoint(x, y)); - event.SetEventObject(this); + // the event ids aren't consecutive so we can't use table based lookup + int joystick; + wxEventType eventType; + switch ( msg ) + { + case MM_JOY1MOVE: + joystick = 1; + eventType = wxEVT_JOY_MOVE; + break; - GetEventHandler()->ProcessEvent(event); -} + case MM_JOY2MOVE: + joystick = 2; + eventType = wxEVT_JOY_MOVE; + break; -void wxWindow::MSWOnJoyUp(int joystick, int x, int y, WXUINT flags) -{ - int buttons = 0; - int change = 0; - if (flags & JOY_BUTTON1CHG) - change = wxJOY_BUTTON1; - if (flags & JOY_BUTTON2CHG) - change = wxJOY_BUTTON2; - if (flags & JOY_BUTTON3CHG) - change = wxJOY_BUTTON3; - if (flags & JOY_BUTTON4CHG) - change = wxJOY_BUTTON4; + case MM_JOY1ZMOVE: + joystick = 1; + eventType = wxEVT_JOY_ZMOVE; + break; - if (flags & JOY_BUTTON1) - buttons |= wxJOY_BUTTON1; - if (flags & JOY_BUTTON2) - buttons |= wxJOY_BUTTON2; - if (flags & JOY_BUTTON3) - buttons |= wxJOY_BUTTON3; - if (flags & JOY_BUTTON4) - buttons |= wxJOY_BUTTON4; + case MM_JOY2ZMOVE: + joystick = 2; + eventType = wxEVT_JOY_ZMOVE; + break; - wxJoystickEvent event(wxEVT_JOY_BUTTON_UP, buttons, joystick, change); - event.SetPosition(wxPoint(x, y)); - event.SetEventObject(this); + case MM_JOY1BUTTONDOWN: + joystick = 1; + eventType = wxEVT_JOY_BUTTON_DOWN; + break; - GetEventHandler()->ProcessEvent(event); -} + case MM_JOY2BUTTONDOWN: + joystick = 2; + eventType = wxEVT_JOY_BUTTON_DOWN; + break; -void wxWindow::MSWOnJoyMove(int joystick, int x, int y, WXUINT flags) -{ - int buttons = 0; - if (flags & JOY_BUTTON1) - buttons |= wxJOY_BUTTON1; - if (flags & JOY_BUTTON2) - buttons |= wxJOY_BUTTON2; - if (flags & JOY_BUTTON3) - buttons |= wxJOY_BUTTON3; - if (flags & JOY_BUTTON4) - buttons |= wxJOY_BUTTON4; + case MM_JOY1BUTTONUP: + joystick = 1; + eventType = wxEVT_JOY_BUTTON_UP; + break; - wxJoystickEvent event(wxEVT_JOY_MOVE, buttons, joystick, 0); - event.SetPosition(wxPoint(x, y)); - event.SetEventObject(this); + case MM_JOY2BUTTONUP: + joystick = 2; + eventType = wxEVT_JOY_BUTTON_UP; + break; - GetEventHandler()->ProcessEvent(event); -} + default: + wxFAIL_MSG("no such joystick event"); -void wxWindow::MSWOnJoyZMove(int joystick, int z, WXUINT flags) -{ - int buttons = 0; - if (flags & JOY_BUTTON1) - buttons |= wxJOY_BUTTON1; - if (flags & JOY_BUTTON2) - buttons |= wxJOY_BUTTON2; - if (flags & JOY_BUTTON3) - buttons |= wxJOY_BUTTON3; - if (flags & JOY_BUTTON4) - buttons |= wxJOY_BUTTON4; + return FALSE; + } - wxJoystickEvent event(wxEVT_JOY_ZMOVE, buttons, joystick, 0); - event.SetZPosition(z); + wxJoystickEvent event(eventType, buttons, joystick, change); + event.SetPosition(wxPoint(x, y)); event.SetEventObject(this); - GetEventHandler()->ProcessEvent(event); + return GetEventHandler()->ProcessEvent(event); } -void wxWindow::MSWOnVScroll(WXWORD wParam, WXWORD pos, WXHWND control) +bool wxWindow::MSWOnScroll(int orientation, WXWORD wParam, + WXWORD pos, WXHWND control) { - if (control) + if ( control ) { wxWindow *child = wxFindWinFromHandle(control); if ( child ) - child->MSWOnVScroll(wParam, pos, control); - return; + return child->MSWOnScroll(orientation, wParam, pos, control); } wxScrollEvent event; event.SetPosition(pos); - event.SetOrientation(wxVERTICAL); + event.SetOrientation(orientation); event.m_eventObject = this; switch ( wParam ) @@ -2769,101 +2277,26 @@ void wxWindow::MSWOnVScroll(WXWORD wParam, WXWORD pos, WXHWND control) break; default: - return; - break; - } - - if (!GetEventHandler()->ProcessEvent(event)) - Default(); -} - -void wxWindow::MSWOnHScroll( WXWORD wParam, WXWORD pos, WXHWND control) -{ - if (control) - { - wxWindow *child = wxFindWinFromHandle(control); - if ( child ) { - child->MSWOnHScroll(wParam, pos, control); - - return; - } - } - else { - wxScrollEvent event; - event.SetPosition(pos); - event.SetOrientation(wxHORIZONTAL); - event.m_eventObject = this; - - switch ( wParam ) - { - case SB_TOP: - event.m_eventType = wxEVT_SCROLL_TOP; - break; - - case SB_BOTTOM: - event.m_eventType = wxEVT_SCROLL_BOTTOM; - break; - - case SB_LINEUP: - event.m_eventType = wxEVT_SCROLL_LINEUP; - break; - - case SB_LINEDOWN: - event.m_eventType = wxEVT_SCROLL_LINEDOWN; - break; - - case SB_PAGEUP: - event.m_eventType = wxEVT_SCROLL_PAGEUP; - break; - - case SB_PAGEDOWN: - event.m_eventType = wxEVT_SCROLL_PAGEDOWN; - break; - - case SB_THUMBTRACK: - case SB_THUMBPOSITION: - event.m_eventType = wxEVT_SCROLL_THUMBTRACK; - break; - - default: - return; - } - - if ( GetEventHandler()->ProcessEvent(event) ) - return; + return FALSE; } - // call the default WM_HSCROLL handler: it's non trivial in some common - // controls (up-down control for example) - Default(); + return GetEventHandler()->ProcessEvent(event); } -void wxWindow::MSWOnShow(bool show, int status) +bool wxWindow::MSWOnShow(bool show, int status) { wxShowEvent event(GetId(), show); event.m_eventObject = this; - GetEventHandler()->ProcessEvent(event); + + return GetEventHandler()->ProcessEvent(event); } bool wxWindow::MSWOnInitDialog(WXHWND WXUNUSED(hWndFocus)) { wxInitDialogEvent event(GetId()); event.m_eventObject = this; - GetEventHandler()->ProcessEvent(event); - return TRUE; -} - -void wxWindow::InitDialog() -{ - wxInitDialogEvent event(GetId()); - event.SetEventObject( this ); - GetEventHandler()->ProcessEvent(event); -} -// Default init dialog behaviour is to transfer data to window -void wxWindow::OnInitDialog(wxInitDialogEvent& event) -{ - TransferDataToWindow(); + return GetEventHandler()->ProcessEvent(event); } void wxGetCharSize(WXHWND wnd, int *x, int *y,wxFont *the_font) @@ -2872,7 +2305,7 @@ void wxGetCharSize(WXHWND wnd, int *x, int *y,wxFont *the_font) HDC dc = ::GetDC((HWND) wnd); HFONT fnt =0; HFONT was = 0; - if (the_font) + if ( the_font ) { // the_font->UseResource(); // the_font->RealizeResource(); @@ -2881,7 +2314,7 @@ void wxGetCharSize(WXHWND wnd, int *x, int *y,wxFont *the_font) was = (HFONT) SelectObject(dc,fnt) ; } GetTextMetrics(dc, &tm); - if (the_font && fnt && was) + if ( the_font && fnt && was ) { SelectObject(dc,was) ; } @@ -2889,7 +2322,7 @@ void wxGetCharSize(WXHWND wnd, int *x, int *y,wxFont *the_font) *x = tm.tmAveCharWidth; *y = tm.tmHeight + tm.tmExternalLeading; - // if (the_font) + // if ( the_font ) // the_font->ReleaseResource(); } @@ -3066,12 +2499,12 @@ void wxWindow::CreateCaret(const wxBitmap *WXUNUSED(bitmap)) void wxWindow::ShowCaret(bool show) { - if (m_caretEnabled) + if ( m_caretEnabled ) { - if (show) - ::ShowCaret((HWND) GetHWND()); + if ( show ) + ::ShowCaret(GetHwnd()); else - ::HideCaret((HWND) GetHWND()); + ::HideCaret(GetHwnd()); m_caretShown = show; } } @@ -3097,7 +2530,7 @@ void wxWindow::GetCaretPos(int *x, int *y) const wxWindow *wxGetActiveWindow() { HWND hWnd = GetActiveWindow(); - if (hWnd != 0) + if ( hWnd != 0 ) { return wxFindWinFromHandle((WXHWND) hWnd); } @@ -3113,7 +2546,7 @@ wxKeyboardHook(int nCode, WORD wParam, DWORD lParam); void wxSetKeyboardHook(bool doIt) { - if (doIt) + if ( doIt ) { wxTheKeyboardHookProc = MakeProcInstance((FARPROC) wxKeyboardHook, wxGetInstance()); wxTheKeyboardHook = SetWindowsHookEx(WH_KEYBOARD, (HOOKPROC) wxTheKeyboardHookProc, wxGetInstance(), @@ -3135,13 +2568,13 @@ int APIENTRY _EXPORT wxKeyboardHook(int nCode, WORD wParam, DWORD lParam) { DWORD hiWord = HIWORD(lParam); - if (nCode != HC_NOREMOVE && ((hiWord & KF_UP) == 0)) + if ( nCode != HC_NOREMOVE && ((hiWord & KF_UP) == 0) ) { int id; - if ((id = wxCharCodeMSWToWX(wParam)) != 0) + if ( (id = wxCharCodeMSWToWX(wParam)) != 0 ) { wxKeyEvent event(wxEVT_CHAR_HOOK); - if ((HIWORD(lParam) & KF_ALTDOWN) == KF_ALTDOWN) + if ( (HIWORD(lParam) & KF_ALTDOWN) == KF_ALTDOWN ) event.m_altDown = TRUE; event.m_eventObject = NULL; @@ -3153,9 +2586,9 @@ wxKeyboardHook(int nCode, WORD wParam, DWORD lParam) event.SetTimestamp(wxApp::sm_lastMessageTime); wxWindow *win = wxGetActiveWindow(); - if (win) + if ( win ) { - if (win->GetEventHandler()->ProcessEvent(event)) + if ( win->GetEventHandler()->ProcessEvent(event) ) return 1; } else @@ -3168,39 +2601,6 @@ wxKeyboardHook(int nCode, WORD wParam, DWORD lParam) return (int)CallNextHookEx(wxTheKeyboardHook, nCode, wParam, lParam); } -void wxWindow::SetSizeHints(int minW, int minH, int maxW, int maxH, int WXUNUSED(incW), int WXUNUSED(incH)) -{ - m_minSizeX = minW; - m_minSizeY = minH; - m_maxSizeX = maxW; - m_maxSizeY = maxH; -} - -void wxWindow::Centre(int direction) -{ - int x, y, width, height, panel_width, panel_height, new_x, new_y; - - wxWindow *father = (wxWindow *)GetParent(); - if (!father) - return; - - father->GetClientSize(&panel_width, &panel_height); - GetSize(&width, &height); - GetPosition(&x, &y); - - new_x = -1; - new_y = -1; - - if (direction & wxHORIZONTAL) - new_x = (int)((panel_width - width)/2); - - if (direction & wxVERTICAL) - new_y = (int)((panel_height - height)/2); - - SetSize(new_x, new_y, -1, -1); - -} - void wxWindow::WarpPointer (int x_pos, int y_pos) { // Move the pointer to (x_pos,y_pos) coordinates. They are expressed in @@ -3209,7 +2609,7 @@ void wxWindow::WarpPointer (int x_pos, int y_pos) int x = x_pos; int y = y_pos; RECT rect; - GetWindowRect ((HWND) GetHWND(), &rect); + GetWindowRect (GetHwnd(), &rect); x += rect.left; y += rect.top; @@ -3221,39 +2621,37 @@ void wxWindow::MSWDeviceToLogical (float *x, float *y) const { } -bool wxWindow::MSWOnEraseBkgnd (WXHDC pDC) +bool wxWindow::MSWOnQueryDragIcon(WXHICON * WXUNUSED(hIcon)) { - wxDC dc ; + return FALSE; +} + +bool wxWindow::MSWOnEraseBkgnd(WXHDC hdc) +{ + wxDC dc; - dc.SetHDC(pDC); + dc.SetHDC(hdc); dc.SetWindow(this); dc.BeginDrawing(); wxEraseEvent event(m_windowId, &dc); event.m_eventObject = this; - if (!GetEventHandler()->ProcessEvent(event)) - { - dc.EndDrawing(); - dc.SelectOldObjects(pDC); - return FALSE; - } - else - { - dc.EndDrawing(); - dc.SelectOldObjects(pDC); - } + bool rc = GetEventHandler()->ProcessEvent(event); + dc.EndDrawing(); + dc.SelectOldObjects(hdc); dc.SetHDC((WXHDC) NULL); - return TRUE; + + return rc; } void wxWindow::OnEraseBackground(wxEraseEvent& event) { - if (!GetHWND()) + if ( !GetHWND() ) return; RECT rect; - ::GetClientRect((HWND) GetHWND(), &rect); + ::GetClientRect(GetHwnd(), &rect); COLORREF ref = PALETTERGB(m_backgroundColour.Red(), m_backgroundColour.Green(), m_backgroundColour.Blue()) ; HBRUSH hBrush = ::CreateSolidBrush(ref); @@ -3293,7 +2691,7 @@ void wxWindow::SetScrollRange(int orient, int range, bool refresh) SCROLLINFO info; int dir; - if (orient == wxHORIZONTAL) { + if ( orient == wxHORIZONTAL ) { dir = SB_HORZ; } else { dir = SB_VERT; @@ -3306,18 +2704,18 @@ void wxWindow::SetScrollRange(int orient, int range, bool refresh) info.nPos = 0; info.fMask = SIF_RANGE | SIF_PAGE; - HWND hWnd = (HWND) GetHWND(); - if (hWnd) + HWND hWnd = GetHwnd(); + if ( hWnd ) ::SetScrollInfo(hWnd, dir, &info, refresh); #else int wOrient ; - if (orient == wxHORIZONTAL) + if ( orient == wxHORIZONTAL ) wOrient = SB_HORZ; else wOrient = SB_VERT; - HWND hWnd = (HWND) GetHWND(); - if (hWnd) + HWND hWnd = GetHwnd(); + if ( hWnd ) ::SetScrollRange(hWnd, wOrient, 0, range, refresh); #endif } @@ -3328,7 +2726,7 @@ void wxWindow::SetScrollPage(int orient, int page, bool refresh) SCROLLINFO info; int dir; - if (orient == wxHORIZONTAL) { + if ( orient == wxHORIZONTAL ) { dir = SB_HORZ; m_xThumbSize = page; } else { @@ -3341,11 +2739,11 @@ void wxWindow::SetScrollPage(int orient, int page, bool refresh) info.nMin = 0; info.fMask = SIF_PAGE ; - HWND hWnd = (HWND) GetHWND(); - if (hWnd) + HWND hWnd = GetHwnd(); + if ( hWnd ) ::SetScrollInfo(hWnd, dir, &info, refresh); #else - if (orient == wxHORIZONTAL) + if ( orient == wxHORIZONTAL ) m_xThumbSize = page; else m_yThumbSize = page; @@ -3355,7 +2753,7 @@ void wxWindow::SetScrollPage(int orient, int page, bool refresh) int wxWindow::OldGetScrollRange(int orient) const { int wOrient ; - if (orient == wxHORIZONTAL) + if ( orient == wxHORIZONTAL ) wOrient = SB_HORZ; else wOrient = SB_VERT; @@ -3365,8 +2763,8 @@ int wxWindow::OldGetScrollRange(int orient) const #else int minPos, maxPos; #endif - HWND hWnd = (HWND) GetHWND(); - if (hWnd) + HWND hWnd = GetHwnd(); + if ( hWnd ) { ::GetScrollRange(hWnd, wOrient, &minPos, &maxPos); #if defined(__WIN95__) @@ -3386,7 +2784,7 @@ int wxWindow::OldGetScrollRange(int orient) const int wxWindow::GetScrollPage(int orient) const { - if (orient == wxHORIZONTAL) + if ( orient == wxHORIZONTAL ) return m_xThumbSize; else return m_yThumbSize; @@ -3396,12 +2794,12 @@ int wxWindow::GetScrollPage(int orient) const int wxWindow::GetScrollPos(int orient) const { int wOrient ; - if (orient == wxHORIZONTAL) + if ( orient == wxHORIZONTAL ) wOrient = SB_HORZ; else wOrient = SB_VERT; - HWND hWnd = (HWND) GetHWND(); - if (hWnd) + HWND hWnd = GetHwnd(); + if ( hWnd ) { return ::GetScrollPos(hWnd, wOrient); } @@ -3414,7 +2812,7 @@ int wxWindow::GetScrollPos(int orient) const int wxWindow::GetScrollRange(int orient) const { int wOrient ; - if (orient == wxHORIZONTAL) + if ( orient == wxHORIZONTAL ) wOrient = SB_HORZ; else wOrient = SB_VERT; @@ -3424,8 +2822,8 @@ int wxWindow::GetScrollRange(int orient) const #else int minPos, maxPos; #endif - HWND hWnd = (HWND) GetHWND(); - if (hWnd) + HWND hWnd = GetHwnd(); + if ( hWnd ) { ::GetScrollRange(hWnd, wOrient, &minPos, &maxPos); #if defined(__WIN95__) @@ -3448,7 +2846,7 @@ int wxWindow::GetScrollRange(int orient) const int wxWindow::GetScrollThumb(int orient) const { - if (orient == wxHORIZONTAL) + if ( orient == wxHORIZONTAL ) return m_xThumbSize; else return m_yThumbSize; @@ -3460,7 +2858,7 @@ void wxWindow::SetScrollPos(int orient, int pos, bool refresh) SCROLLINFO info; int dir; - if (orient == wxHORIZONTAL) { + if ( orient == wxHORIZONTAL ) { dir = SB_HORZ; } else { dir = SB_VERT; @@ -3472,18 +2870,18 @@ void wxWindow::SetScrollPos(int orient, int pos, bool refresh) info.nPos = pos; info.fMask = SIF_POS ; - HWND hWnd = (HWND) GetHWND(); - if (hWnd) + HWND hWnd = GetHwnd(); + if ( hWnd ) ::SetScrollInfo(hWnd, dir, &info, refresh); #else int wOrient ; - if (orient == wxHORIZONTAL) + if ( orient == wxHORIZONTAL ) wOrient = SB_HORZ; else wOrient = SB_VERT; - HWND hWnd = (HWND) GetHWND(); - if (hWnd) + HWND hWnd = GetHwnd(); + if ( hWnd ) ::SetScrollPos(hWnd, wOrient, pos, refresh); #endif } @@ -3513,765 +2911,223 @@ SetScrollPage(orient, thumbVisible, FALSE); range1 += (pageSize - 1); } - SCROLLINFO info; - int dir; - - if (orient == wxHORIZONTAL) { - dir = SB_HORZ; - } else { - dir = SB_VERT; - } - - info.cbSize = sizeof(SCROLLINFO); - info.nPage = pageSize; // Have to set this, or scrollbar goes awry - info.nMin = 0; - info.nMax = range1; - info.nPos = pos; - info.fMask = SIF_RANGE | SIF_PAGE | SIF_POS; - - HWND hWnd = (HWND) GetHWND(); - if (hWnd) - ::SetScrollInfo(hWnd, dir, &info, refresh); -#else - int wOrient ; - if (orient == wxHORIZONTAL) - wOrient = SB_HORZ; - else - wOrient = SB_VERT; - - HWND hWnd = (HWND) GetHWND(); - if (hWnd) - { - ::SetScrollRange(hWnd, wOrient, 0, range, FALSE); - ::SetScrollPos(hWnd, wOrient, pos, refresh); - } -#endif - if (orient == wxHORIZONTAL) { - m_xThumbSize = thumbVisible; - } else { - m_yThumbSize = thumbVisible; - } -} - -void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect) -{ - RECT rect2; - if ( rect ) - { - rect2.left = rect->x; - rect2.top = rect->y; - rect2.right = rect->x + rect->width; - rect2.bottom = rect->y + rect->height; - } - - if ( rect ) - ::ScrollWindow((HWND) GetHWND(), dx, dy, &rect2, NULL); - else - ::ScrollWindow((HWND) GetHWND(), dx, dy, NULL, NULL); -} - -void wxWindow::SetFont(const wxFont& font) -{ - m_windowFont = font; - - if (!m_windowFont.Ok()) - return; - - HWND hWnd = (HWND) GetHWND(); - if (hWnd != 0) - { - if (m_windowFont.GetResourceHandle()) - SendMessage(hWnd, WM_SETFONT, - (WPARAM)m_windowFont.GetResourceHandle(),TRUE); - } -} - -void wxWindow::SubclassWin(WXHWND hWnd) -{ - wxASSERT_MSG( !m_oldWndProc, "subclassing window twice?" ); - - wxAssociateWinWithHandle((HWND)hWnd, this); - - m_oldWndProc = (WXFARPROC) GetWindowLong((HWND) hWnd, GWL_WNDPROC); - SetWindowLong((HWND) hWnd, GWL_WNDPROC, (LONG) wxWndProc); -} - -void wxWindow::UnsubclassWin() -{ - wxRemoveHandleAssociation(this); - - // Restore old Window proc - if ((HWND) GetHWND()) - { - FARPROC farProc = (FARPROC) GetWindowLong((HWND) GetHWND(), GWL_WNDPROC); - if ((m_oldWndProc != 0) && (farProc != (FARPROC) m_oldWndProc)) - { - SetWindowLong((HWND) GetHWND(), GWL_WNDPROC, (LONG) m_oldWndProc); - m_oldWndProc = 0; - } - } -} - -// Make a Windows extended style from the given wxWindows window style -WXDWORD wxWindow::MakeExtendedStyle(long style, bool eliminateBorders) -{ - WXDWORD exStyle = 0; - if ( style & wxTRANSPARENT_WINDOW ) - exStyle |= WS_EX_TRANSPARENT ; - - if ( !eliminateBorders ) - { - if ( style & wxSUNKEN_BORDER ) - exStyle |= WS_EX_CLIENTEDGE ; - if ( style & wxDOUBLE_BORDER ) - exStyle |= WS_EX_DLGMODALFRAME ; -#if defined(__WIN95__) - if ( style & wxRAISED_BORDER ) - exStyle |= WS_EX_WINDOWEDGE ; - if ( style & wxSTATIC_BORDER ) - exStyle |= WS_EX_STATICEDGE ; -#endif - } - return exStyle; -} - -// Determines whether native 3D effects or CTL3D should be used, -// applying a default border style if required, and returning an extended -// style to pass to CreateWindowEx. -WXDWORD wxWindow::Determine3DEffects(WXDWORD defaultBorderStyle, bool *want3D) -{ - // If matches certain criteria, then assume no 3D effects - // unless specifically requested (dealt with in MakeExtendedStyle) - if ( !GetParent() || !IsKindOf(CLASSINFO(wxControl)) || (m_windowStyle & wxNO_BORDER) ) - { - *want3D = FALSE; - return MakeExtendedStyle(m_windowStyle, FALSE); - } - - // Determine whether we should be using 3D effects or not. - bool nativeBorder = FALSE; // by default, we don't want a Win95 effect - - // 1) App can specify global 3D effects - *want3D = wxTheApp->GetAuto3D(); - - // 2) If the parent is being drawn with user colours, or simple border specified, - // switch effects off. TODO: replace wxUSER_COLOURS with wxNO_3D - if (GetParent() && (GetParent()->GetWindowStyleFlag() & wxUSER_COLOURS) || (m_windowStyle & wxSIMPLE_BORDER)) - *want3D = FALSE; - - // 3) Control can override this global setting by defining - // a border style, e.g. wxSUNKEN_BORDER - if (m_windowStyle & wxSUNKEN_BORDER ) - *want3D = TRUE; - - // 4) If it's a special border, CTL3D can't cope so we want a native border - if ( (m_windowStyle & wxDOUBLE_BORDER) || (m_windowStyle & wxRAISED_BORDER) || - (m_windowStyle & wxSTATIC_BORDER) ) - { - *want3D = TRUE; - nativeBorder = TRUE; - } - - // 5) If this isn't a Win95 app, and we are using CTL3D, remove border - // effects from extended style -#if wxUSE_CTL3D - if ( *want3D ) - nativeBorder = FALSE; -#endif - - DWORD exStyle = MakeExtendedStyle(m_windowStyle, !nativeBorder); - - // If we want 3D, but haven't specified a border here, - // apply the default border style specified. - // TODO what about non-Win95 WIN32? Does it have borders? -#if defined(__WIN95__) && !wxUSE_CTL3D - if (defaultBorderStyle && (*want3D) && ! ((m_windowStyle & wxDOUBLE_BORDER) || (m_windowStyle & wxRAISED_BORDER) || - (m_windowStyle & wxSTATIC_BORDER) || (m_windowStyle & wxSIMPLE_BORDER) )) - exStyle |= defaultBorderStyle; // WS_EX_CLIENTEDGE ; -#endif - - return exStyle; -} - -void wxWindow::OnChar(wxKeyEvent& event) -{ - bool isVirtual; - int id = wxCharCodeWXToMSW((int)event.KeyCode(), &isVirtual); - - if ( id == -1 ) - id= m_lastWParam; - - if ( !event.ControlDown() ) // Why this test? - (void) MSWDefWindowProc(m_lastMsg, (WPARAM) id, m_lastLParam); -} - -bool wxWindow::IsEnabled(void) const -{ - return (::IsWindowEnabled((HWND) GetHWND()) != 0); -} - -// Dialog support: override these and call -// base class members to add functionality -// that can't be done using validators. -// NOTE: these functions assume that controls -// are direct children of this window, not grandchildren -// or other levels of descendant. - -// Transfer values to controls. If returns FALSE, -// it's an application error (pops up a dialog) -bool wxWindow::TransferDataToWindow() -{ - wxNode *node = GetChildren().First(); - while ( node ) - { - wxWindow *child = (wxWindow *)node->Data(); - if ( child->GetValidator() && /* child->GetValidator()->Ok() && */ - !child->GetValidator()->TransferToWindow() ) - { - wxLogError(_("Could not transfer data to window")); - return FALSE; - } - - node = node->Next(); - } - return TRUE; -} - -// Transfer values from controls. If returns FALSE, -// validation failed: don't quit -bool wxWindow::TransferDataFromWindow() -{ - wxNode *node = GetChildren().First(); - while ( node ) - { - wxWindow *child = (wxWindow *)node->Data(); - if ( child->GetValidator() && /* child->GetValidator()->Ok() && */ !child->GetValidator()->TransferFromWindow() ) - { - return FALSE; - } - - node = node->Next(); - } - return TRUE; -} - -bool wxWindow::Validate() -{ - wxNode *node = GetChildren().First(); - while ( node ) - { - wxWindow *child = (wxWindow *)node->Data(); - if ( child->GetValidator() && /* child->GetValidator()->Ok() && */ !child->GetValidator()->Validate(this) ) - { - return FALSE; - } - - node = node->Next(); - } - return TRUE; -} - -// Get the window with the focus -wxWindow *wxWindow::FindFocus() -{ - HWND hWnd = ::GetFocus(); - if ( hWnd ) - { - return wxFindWinFromHandle((WXHWND) hWnd); - } - return NULL; -} - -void wxWindow::AddChild(wxWindow *child) -{ - GetChildren().Append(child); - child->m_windowParent = this; -} - -void wxWindow::RemoveChild(wxWindow *child) -{ -// if (GetChildren()) - GetChildren().DeleteObject(child); - child->m_windowParent = NULL; -} - -void wxWindow::DestroyChildren() -{ - wxNode *node; - while ((node = GetChildren().First()) != (wxNode *)NULL) { - wxWindow *child; - if ((child = (wxWindow *)node->Data()) != (wxWindow *)NULL) { - delete child; - if ( GetChildren().Member(child) ) - delete node; - } - } /* while */ -} - -void wxWindow::MakeModal(bool modal) -{ - // Disable all other windows - if (this->IsKindOf(CLASSINFO(wxDialog)) || this->IsKindOf(CLASSINFO(wxFrame))) - { - wxNode *node = wxTopLevelWindows.First(); - while (node) - { - wxWindow *win = (wxWindow *)node->Data(); - if (win != this) - win->Enable(!modal); - - node = node->Next(); - } - } -} - -// If nothing defined for this, try the parent. -// E.g. we may be a button loaded from a resource, with no callback function -// defined. -void wxWindow::OnCommand(wxWindow& win, wxCommandEvent& event) -{ - if (GetEventHandler()->ProcessEvent(event) ) - return; - if (m_windowParent) - m_windowParent->GetEventHandler()->OnCommand(win, event); -} - -void wxWindow::SetConstraints(wxLayoutConstraints *c) -{ - if (m_constraints) - { - UnsetConstraints(m_constraints); - delete m_constraints; - } - m_constraints = c; - if (m_constraints) - { - // Make sure other windows know they're part of a 'meaningful relationship' - if (m_constraints->left.GetOtherWindow() && (m_constraints->left.GetOtherWindow() != this)) - m_constraints->left.GetOtherWindow()->AddConstraintReference((wxWindow *)this); - if (m_constraints->top.GetOtherWindow() && (m_constraints->top.GetOtherWindow() != this)) - m_constraints->top.GetOtherWindow()->AddConstraintReference((wxWindow *)this); - if (m_constraints->right.GetOtherWindow() && (m_constraints->right.GetOtherWindow() != this)) - m_constraints->right.GetOtherWindow()->AddConstraintReference((wxWindow *)this); - if (m_constraints->bottom.GetOtherWindow() && (m_constraints->bottom.GetOtherWindow() != this)) - m_constraints->bottom.GetOtherWindow()->AddConstraintReference((wxWindow *)this); - if (m_constraints->width.GetOtherWindow() && (m_constraints->width.GetOtherWindow() != this)) - m_constraints->width.GetOtherWindow()->AddConstraintReference((wxWindow *)this); - if (m_constraints->height.GetOtherWindow() && (m_constraints->height.GetOtherWindow() != this)) - m_constraints->height.GetOtherWindow()->AddConstraintReference((wxWindow *)this); - if (m_constraints->centreX.GetOtherWindow() && (m_constraints->centreX.GetOtherWindow() != this)) - m_constraints->centreX.GetOtherWindow()->AddConstraintReference((wxWindow *)this); - if (m_constraints->centreY.GetOtherWindow() && (m_constraints->centreY.GetOtherWindow() != this)) - m_constraints->centreY.GetOtherWindow()->AddConstraintReference((wxWindow *)this); - } -} - -// This removes any dangling pointers to this window -// in other windows' constraintsInvolvedIn lists. -void wxWindow::UnsetConstraints(wxLayoutConstraints *c) -{ - if (c) - { - if (c->left.GetOtherWindow() && (c->top.GetOtherWindow() != this)) - c->left.GetOtherWindow()->RemoveConstraintReference((wxWindow *)this); - if (c->top.GetOtherWindow() && (c->top.GetOtherWindow() != this)) - c->top.GetOtherWindow()->RemoveConstraintReference((wxWindow *)this); - if (c->right.GetOtherWindow() && (c->right.GetOtherWindow() != this)) - c->right.GetOtherWindow()->RemoveConstraintReference((wxWindow *)this); - if (c->bottom.GetOtherWindow() && (c->bottom.GetOtherWindow() != this)) - c->bottom.GetOtherWindow()->RemoveConstraintReference((wxWindow *)this); - if (c->width.GetOtherWindow() && (c->width.GetOtherWindow() != this)) - c->width.GetOtherWindow()->RemoveConstraintReference((wxWindow *)this); - if (c->height.GetOtherWindow() && (c->height.GetOtherWindow() != this)) - c->height.GetOtherWindow()->RemoveConstraintReference((wxWindow *)this); - if (c->centreX.GetOtherWindow() && (c->centreX.GetOtherWindow() != this)) - c->centreX.GetOtherWindow()->RemoveConstraintReference((wxWindow *)this); - if (c->centreY.GetOtherWindow() && (c->centreY.GetOtherWindow() != this)) - c->centreY.GetOtherWindow()->RemoveConstraintReference((wxWindow *)this); - } -} - -// Back-pointer to other windows we're involved with, so if we delete -// this window, we must delete any constraints we're involved with. -void wxWindow::AddConstraintReference(wxWindow *otherWin) -{ - if (!m_constraintsInvolvedIn) - m_constraintsInvolvedIn = new wxList; - if (!m_constraintsInvolvedIn->Member(otherWin)) - m_constraintsInvolvedIn->Append(otherWin); -} - -// REMOVE back-pointer to other windows we're involved with. -void wxWindow::RemoveConstraintReference(wxWindow *otherWin) -{ - if (m_constraintsInvolvedIn) - m_constraintsInvolvedIn->DeleteObject(otherWin); -} - -// Reset any constraints that mention this window -void wxWindow::DeleteRelatedConstraints() -{ - if (m_constraintsInvolvedIn) - { - wxNode *node = m_constraintsInvolvedIn->First(); - while (node) - { - wxWindow *win = (wxWindow *)node->Data(); - wxNode *next = node->Next(); - wxLayoutConstraints *constr = win->GetConstraints(); - - // Reset any constraints involving this window - if (constr) - { - constr->left.ResetIfWin((wxWindow *)this); - constr->top.ResetIfWin((wxWindow *)this); - constr->right.ResetIfWin((wxWindow *)this); - constr->bottom.ResetIfWin((wxWindow *)this); - constr->width.ResetIfWin((wxWindow *)this); - constr->height.ResetIfWin((wxWindow *)this); - constr->centreX.ResetIfWin((wxWindow *)this); - constr->centreY.ResetIfWin((wxWindow *)this); - } - delete node; - node = next; - } - delete m_constraintsInvolvedIn; - m_constraintsInvolvedIn = NULL; - } -} - -void wxWindow::SetSizer(wxSizer *sizer) -{ - m_windowSizer = sizer; - if (sizer) - sizer->SetSizerParent((wxWindow *)this); -} - -/* -* New version -*/ - -bool wxWindow::Layout() -{ - if (GetConstraints()) - { - int w, h; - GetClientSize(&w, &h); - GetConstraints()->width.SetValue(w); - GetConstraints()->height.SetValue(h); - } - - // If top level (one sizer), evaluate the sizer's constraints. - if (GetSizer()) - { - int noChanges; - GetSizer()->ResetConstraints(); // Mark all constraints as unevaluated - GetSizer()->LayoutPhase1(&noChanges); - GetSizer()->LayoutPhase2(&noChanges); - GetSizer()->SetConstraintSizes(); // Recursively set the real window sizes - return TRUE; - } - else - { - // Otherwise, evaluate child constraints - ResetConstraints(); // Mark all constraints as unevaluated - DoPhase(1); // Just one phase need if no sizers involved - DoPhase(2); - SetConstraintSizes(); // Recursively set the real window sizes - } - return TRUE; -} - + SCROLLINFO info; + int dir; -// Do a phase of evaluating constraints: -// the default behaviour. wxSizers may do a similar -// thing, but also impose their own 'constraints' -// and order the evaluation differently. -bool wxWindow::LayoutPhase1(int *noChanges) -{ - wxLayoutConstraints *constr = GetConstraints(); - if (constr) - { - return constr->SatisfyConstraints((wxWindow *)this, noChanges); + if ( orient == wxHORIZONTAL ) { + dir = SB_HORZ; + } else { + dir = SB_VERT; } - else - return TRUE; -} -bool wxWindow::LayoutPhase2(int *noChanges) -{ - *noChanges = 0; + info.cbSize = sizeof(SCROLLINFO); + info.nPage = pageSize; // Have to set this, or scrollbar goes awry + info.nMin = 0; + info.nMax = range1; + info.nPos = pos; + info.fMask = SIF_RANGE | SIF_PAGE | SIF_POS; - // Layout children - DoPhase(1); - DoPhase(2); - return TRUE; -} + HWND hWnd = GetHwnd(); + if ( hWnd ) + ::SetScrollInfo(hWnd, dir, &info, refresh); +#else + int wOrient ; + if ( orient == wxHORIZONTAL ) + wOrient = SB_HORZ; + else + wOrient = SB_VERT; -// Do a phase of evaluating child constraints -bool wxWindow::DoPhase(int phase) -{ - int noIterations = 0; - int maxIterations = 500; - int noChanges = 1; - int noFailures = 0; - wxList succeeded; - while ((noChanges > 0) && (noIterations < maxIterations)) + HWND hWnd = GetHwnd(); + if ( hWnd ) { - noChanges = 0; - noFailures = 0; - wxNode *node = GetChildren().First(); - while (node) - { - wxWindow *child = (wxWindow *)node->Data(); - if (!child->IsKindOf(CLASSINFO(wxFrame)) && !child->IsKindOf(CLASSINFO(wxDialog))) - { - wxLayoutConstraints *constr = child->GetConstraints(); - if (constr) - { - if (succeeded.Member(child)) - { - } - else - { - int tempNoChanges = 0; - bool success = ( (phase == 1) ? child->LayoutPhase1(&tempNoChanges) : child->LayoutPhase2(&tempNoChanges) ) ; - noChanges += tempNoChanges; - if (success) - { - succeeded.Append(child); - } - } - } - } - node = node->Next(); - } - noIterations ++; + ::SetScrollRange(hWnd, wOrient, 0, range, FALSE); + ::SetScrollPos(hWnd, wOrient, pos, refresh); + } +#endif + if ( orient == wxHORIZONTAL ) { + m_xThumbSize = thumbVisible; + } else { + m_yThumbSize = thumbVisible; } - return TRUE; } -void wxWindow::ResetConstraints() +void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect) { - wxLayoutConstraints *constr = GetConstraints(); - if (constr) - { - constr->left.SetDone(FALSE); - constr->top.SetDone(FALSE); - constr->right.SetDone(FALSE); - constr->bottom.SetDone(FALSE); - constr->width.SetDone(FALSE); - constr->height.SetDone(FALSE); - constr->centreX.SetDone(FALSE); - constr->centreY.SetDone(FALSE); - } - wxNode *node = GetChildren().First(); - while (node) + RECT rect2; + if ( rect ) { - wxWindow *win = (wxWindow *)node->Data(); - if (!win->IsKindOf(CLASSINFO(wxFrame)) && !win->IsKindOf(CLASSINFO(wxDialog))) - win->ResetConstraints(); - node = node->Next(); + rect2.left = rect->x; + rect2.top = rect->y; + rect2.right = rect->x + rect->width; + rect2.bottom = rect->y + rect->height; } + + if ( rect ) + ::ScrollWindow(GetHwnd(), dx, dy, &rect2, NULL); + else + ::ScrollWindow(GetHwnd(), dx, dy, NULL, NULL); } -// Need to distinguish between setting the 'fake' size for -// windows and sizers, and setting the real values. -void wxWindow::SetConstraintSizes(bool recurse) +bool wxWindow::SetFont(const wxFont& font) { - wxLayoutConstraints *constr = GetConstraints(); - if (constr && constr->left.GetDone() && constr->right.GetDone() && - constr->width.GetDone() && constr->height.GetDone()) + if ( !wxWindowBase::SetFont(font) ) { - int x = constr->left.GetValue(); - int y = constr->top.GetValue(); - int w = constr->width.GetValue(); - int h = constr->height.GetValue(); - - // If we don't want to resize this window, just move it... - if ((constr->width.GetRelationship() != wxAsIs) || - (constr->height.GetRelationship() != wxAsIs)) - { - // Calls Layout() recursively. AAAGH. How can we stop that. - // Simply take Layout() out of non-top level OnSizes. - SizerSetSize(x, y, w, h); - } - else - { - SizerMove(x, y); - } + // nothing to do + return FALSE; } - else if (constr) + + HWND hWnd = GetHwnd(); + if ( hWnd != 0 ) { - char *windowClass = this->GetClassInfo()->GetClassName(); + WXHANDLE hFont = m_font.GetResourceHandle(); - wxString winName; - if (GetName() == "") - winName = "unnamed"; - else - winName = GetName(); - wxLogDebug("Constraint(s) not satisfied for window of type %s, name %s:", - (const char *)windowClass, (const char *)winName); - if (!constr->left.GetDone()) - wxLogDebug(" unsatisfied 'left' constraint."); - if (!constr->right.GetDone()) - wxLogDebug(" unsatisfied 'right' constraint."); - if (!constr->width.GetDone()) - wxLogDebug(" unsatisfied 'width' constraint."); - if (!constr->height.GetDone()) - wxLogDebug(" unsatisfied 'height' constraint."); - wxLogDebug("Please check constraints: try adding AsIs() constraints.\n"); - } + wxASSERT_MSG( hFont, _T("should have valid font") ); - if (recurse) - { - wxNode *node = GetChildren().First(); - while (node) - { - wxWindow *win = (wxWindow *)node->Data(); - if (!win->IsKindOf(CLASSINFO(wxFrame)) && !win->IsKindOf(CLASSINFO(wxDialog))) - win->SetConstraintSizes(); - node = node->Next(); - } + ::SendMessage(hWnd, WM_SETFONT, (WPARAM)hFont, TRUE); } + + return TRUE; } -// This assumes that all sizers are 'on' the same -// window, i.e. the parent of this window. -void wxWindow::TransformSizerToActual(int *x, int *y) const +void wxWindow::SubclassWin(WXHWND hWnd) { - if (!m_sizerParent || m_sizerParent->IsKindOf(CLASSINFO(wxDialog)) || - m_sizerParent->IsKindOf(CLASSINFO(wxFrame)) ) - return; + wxASSERT_MSG( !m_oldWndProc, "subclassing window twice?" ); - int xp, yp; - m_sizerParent->GetPosition(&xp, &yp); - m_sizerParent->TransformSizerToActual(&xp, &yp); - *x += xp; - *y += yp; -} + wxAssociateWinWithHandle((HWND)hWnd, this); -void wxWindow::SizerSetSize(int x, int y, int w, int h) -{ - int xx = x; - int yy = y; - TransformSizerToActual(&xx, &yy); - SetSize(xx, yy, w, h); + m_oldWndProc = (WXFARPROC) GetWindowLong((HWND) hWnd, GWL_WNDPROC); + SetWindowLong((HWND) hWnd, GWL_WNDPROC, (LONG) wxWndProc); } -void wxWindow::SizerMove(int x, int y) +void wxWindow::UnsubclassWin() { - int xx = x; - int yy = y; - TransformSizerToActual(&xx, &yy); - Move(xx, yy); -} + wxRemoveHandleAssociation(this); -// Only set the size/position of the constraint (if any) -void wxWindow::SetSizeConstraint(int x, int y, int w, int h) -{ - wxLayoutConstraints *constr = GetConstraints(); - if (constr) + // Restore old Window proc + if ( GetHwnd() ) { - if (x != -1) - { - constr->left.SetValue(x); - constr->left.SetDone(TRUE); - } - if (y != -1) - { - constr->top.SetValue(y); - constr->top.SetDone(TRUE); - } - if (w != -1) - { - constr->width.SetValue(w); - constr->width.SetDone(TRUE); - } - if (h != -1) + FARPROC farProc = (FARPROC) GetWindowLong(GetHwnd(), GWL_WNDPROC); + if ( (m_oldWndProc != 0) && (farProc != (FARPROC) m_oldWndProc) ) { - constr->height.SetValue(h); - constr->height.SetDone(TRUE); + SetWindowLong(GetHwnd(), GWL_WNDPROC, (LONG) m_oldWndProc); + m_oldWndProc = 0; } } } -void wxWindow::MoveConstraint(int x, int y) +// Make a Windows extended style from the given wxWindows window style +WXDWORD wxWindow::MakeExtendedStyle(long style, bool eliminateBorders) { - wxLayoutConstraints *constr = GetConstraints(); - if (constr) + WXDWORD exStyle = 0; + if ( style & wxTRANSPARENT_WINDOW ) + exStyle |= WS_EX_TRANSPARENT ; + + if ( !eliminateBorders ) { - if (x != -1) - { - constr->left.SetValue(x); - constr->left.SetDone(TRUE); - } - if (y != -1) - { - constr->top.SetValue(y); - constr->top.SetDone(TRUE); - } + if ( style & wxSUNKEN_BORDER ) + exStyle |= WS_EX_CLIENTEDGE ; + if ( style & wxDOUBLE_BORDER ) + exStyle |= WS_EX_DLGMODALFRAME ; +#if defined(__WIN95__) + if ( style & wxRAISED_BORDER ) + exStyle |= WS_EX_WINDOWEDGE ; + if ( style & wxSTATIC_BORDER ) + exStyle |= WS_EX_STATICEDGE ; +#endif } + return exStyle; } -void wxWindow::GetSizeConstraint(int *w, int *h) const +// Determines whether native 3D effects or CTL3D should be used, +// applying a default border style if required, and returning an extended +// style to pass to CreateWindowEx. +WXDWORD wxWindow::Determine3DEffects(WXDWORD defaultBorderStyle, bool *want3D) { - wxLayoutConstraints *constr = GetConstraints(); - if (constr) + // If matches certain criteria, then assume no 3D effects + // unless specifically requested (dealt with in MakeExtendedStyle) + if ( !GetParent() || !IsKindOf(CLASSINFO(wxControl)) || (m_windowStyle & wxNO_BORDER) ) { - *w = constr->width.GetValue(); - *h = constr->height.GetValue(); + *want3D = FALSE; + return MakeExtendedStyle(m_windowStyle, FALSE); } - else - GetSize(w, h); -} -void wxWindow::GetClientSizeConstraint(int *w, int *h) const -{ - wxLayoutConstraints *constr = GetConstraints(); - if (constr) + // Determine whether we should be using 3D effects or not. + bool nativeBorder = FALSE; // by default, we don't want a Win95 effect + + // 1) App can specify global 3D effects + *want3D = wxTheApp->GetAuto3D(); + + // 2) If the parent is being drawn with user colours, or simple border specified, + // switch effects off. TODO: replace wxUSER_COLOURS with wxNO_3D + if ( GetParent() && (GetParent()->GetWindowStyleFlag() & wxUSER_COLOURS) || (m_windowStyle & wxSIMPLE_BORDER) ) + *want3D = FALSE; + + // 3) Control can override this global setting by defining + // a border style, e.g. wxSUNKEN_BORDER + if ( m_windowStyle & wxSUNKEN_BORDER ) + *want3D = TRUE; + + // 4) If it's a special border, CTL3D can't cope so we want a native border + if ( (m_windowStyle & wxDOUBLE_BORDER) || (m_windowStyle & wxRAISED_BORDER) || + (m_windowStyle & wxSTATIC_BORDER) ) { - *w = constr->width.GetValue(); - *h = constr->height.GetValue(); + *want3D = TRUE; + nativeBorder = TRUE; } - else - GetClientSize(w, h); + + // 5) If this isn't a Win95 app, and we are using CTL3D, remove border + // effects from extended style +#if wxUSE_CTL3D + if ( *want3D ) + nativeBorder = FALSE; +#endif + + DWORD exStyle = MakeExtendedStyle(m_windowStyle, !nativeBorder); + + // If we want 3D, but haven't specified a border here, + // apply the default border style specified. + // TODO what about non-Win95 WIN32? Does it have borders? +#if defined(__WIN95__) && !wxUSE_CTL3D + if ( defaultBorderStyle && (*want3D) && ! ((m_windowStyle & wxDOUBLE_BORDER) || (m_windowStyle & wxRAISED_BORDER ) || + (m_windowStyle & wxSTATIC_BORDER) || (m_windowStyle & wxSIMPLE_BORDER) )) + exStyle |= defaultBorderStyle; // WS_EX_CLIENTEDGE ; +#endif + + return exStyle; } -void wxWindow::GetPositionConstraint(int *x, int *y) const +// Get the window with the focus +wxWindow *wxWindowBase::FindFocus() { - wxLayoutConstraints *constr = GetConstraints(); - if (constr) + HWND hWnd = ::GetFocus(); + if ( hWnd ) { - *x = constr->left.GetValue(); - *y = constr->top.GetValue(); + return wxFindWinFromHandle((WXHWND) hWnd); } - else - GetPosition(x, y); + return NULL; } -bool wxWindow::Close(bool force) +// If nothing defined for this, try the parent. +// E.g. we may be a button loaded from a resource, with no callback function +// defined. +void wxWindow::OnCommand(wxWindow& win, wxCommandEvent& event) { - wxCloseEvent event(wxEVT_CLOSE_WINDOW, m_windowId); - event.SetEventObject(this); -#if WXWIN_COMPATIBILITY - event.SetForce(force); -#endif - event.SetCanVeto(!force); - - return (GetEventHandler()->ProcessEvent(event) && !event.GetVeto()); + if ( GetEventHandler()->ProcessEvent(event) ) + return; + if ( m_parent ) + m_parent->GetEventHandler()->OnCommand(win, event); } wxObject* wxWindow::GetChild(int number) const { // Return a pointer to the Nth object in the Panel -// if (!GetChildren()) +// if ( !GetChildren() ) // return(NULL) ; wxNode *node = GetChildren().First(); int n = number; while (node && n--) node = node->Next() ; - if (node) + if ( node ) { wxObject *obj = (wxObject *)node->Data(); return(obj) ; @@ -4286,12 +3142,12 @@ void wxWindow::OnDefaultAction(wxControl *initiatingItem) * we explicitly intercept the wxEVT_COMMAND_LISTBOX_DOUBLECLICKED * event. - if (initiatingItem->IsKindOf(CLASSINFO(wxListBox))) + if ( initiatingItem->IsKindOf(CLASSINFO(wxListBox)) ) { wxListBox *lbox = (wxListBox *)initiatingItem; wxCommandEvent event(wxEVT_COMMAND_LEFT_DCLICK); event.m_commandInt = -1; - if ((lbox->GetWindowStyleFlag() & wxLB_MULTIPLE) == 0) + if ( (lbox->GetWindowStyleFlag() & wxLB_MULTIPLE) == 0 ) { event.m_commandString = copystring(lbox->GetStringSelection()); event.m_commandInt = lbox->GetSelection(); @@ -4301,13 +3157,13 @@ void wxWindow::OnDefaultAction(wxControl *initiatingItem) lbox->ProcessCommand(event); - if (event.m_commandString) + if ( event.m_commandString ) delete[] event.m_commandString; return; } wxButton *but = GetDefaultItem(); - if (but) + if ( but ) { wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED); event.SetEventObject(but); @@ -4324,73 +3180,6 @@ void wxWindow::Clear() dc.Clear(); } -// Fits the panel around the items -void wxWindow::Fit() -{ - int maxX = 0; - int maxY = 0; - wxNode *node = GetChildren().First(); - while ( node ) - { - wxWindow *win = (wxWindow *)node->Data(); - int wx, wy, ww, wh; - win->GetPosition(&wx, &wy); - win->GetSize(&ww, &wh); - if ( wx + ww > maxX ) - maxX = wx + ww; - if ( wy + wh > maxY ) - maxY = wy + wh; - - node = node->Next(); - } - SetClientSize(maxX + 5, maxY + 5); -} - -void wxWindow::SetValidator(const wxValidator& validator) -{ - if ( m_windowValidator ) - delete m_windowValidator; - m_windowValidator = validator.Clone(); - - if ( m_windowValidator ) - m_windowValidator->SetWindow(this) ; -} - -// Find a window by id or name -wxWindow *wxWindow::FindWindow(long id) -{ - if ( GetId() == id) - return this; - - wxNode *node = GetChildren().First(); - while ( node ) - { - wxWindow *child = (wxWindow *)node->Data(); - wxWindow *found = child->FindWindow(id); - if ( found ) - return found; - node = node->Next(); - } - return NULL; -} - -wxWindow *wxWindow::FindWindow(const wxString& name) -{ - if ( GetName() == name) - return this; - - wxNode *node = GetChildren().First(); - while ( node ) - { - wxWindow *child = (wxWindow *)node->Data(); - wxWindow *found = child->FindWindow(name); - if ( found ) - return found; - node = node->Next(); - } - return NULL; -} - /* TODO // Default input behaviour for a scrolling canvas should be to scroll // according to the cursor keys pressed @@ -4412,7 +3201,7 @@ int y_pages = 0; // Bugfix End ViewStart(&start_x, &start_y); // Bugfix begin - if (vert_units) + if ( vert_units ) y_pages = (int)(v_height/vert_units) - y_page; #ifdef __WXMSW__ @@ -4426,9 +3215,9 @@ int y_pages = 0; case WXK_PRIOR: { // BugFix Begin - if (y_page > 0) + if ( y_page > 0 ) { - if (start_y - y_page > 0) + if ( start_y - y_page > 0 ) Scroll(start_x, start_y - y_page); else Scroll(start_x, 0); @@ -4439,9 +3228,9 @@ int y_pages = 0; case WXK_NEXT: { // Bugfix Begin - if ((y_page > 0) && (start_y <= y_pages-y-1)) + if ( (y_page > 0) && (start_y <= y_pages-y-1) ) { - if (y_pages + y < start_y + y_page) + if ( y_pages + y < start_y + y_page ) Scroll(start_x, y_pages + y); else Scroll(start_x, start_y + y_page); @@ -4451,14 +3240,14 @@ int y_pages = 0; } case WXK_UP: { - if ((y_page > 0) && (start_y >= 1)) + if ( (y_page > 0) && (start_y >= 1) ) Scroll(start_x, start_y - 1); break; } case WXK_DOWN: { // Bugfix Begin - if ((y_page > 0) && (start_y <= y_pages-y-1)) + if ( (y_page > 0) && (start_y <= y_pages-y-1) ) // Bugfix End { Scroll(start_x, start_y + 1); @@ -4467,13 +3256,13 @@ int y_pages = 0; } case WXK_LEFT: { - if ((x_page > 0) && (start_x >= 1)) + if ( (x_page > 0) && (start_x >= 1) ) Scroll(start_x - 1, start_y); break; } case WXK_RIGHT: { - if (x_page > 0) + if ( x_page > 0 ) Scroll(start_x + 1, start_y); break; } @@ -4496,106 +3285,61 @@ int y_pages = 0; // Setup background and foreground colours correctly void wxWindow::SetupColours() { - if (GetParent()) + if ( GetParent() ) SetBackgroundColour(GetParent()->GetBackgroundColour()); } void wxWindow::OnIdle(wxIdleEvent& event) { // Check if we need to send a LEAVE event - if (m_mouseInWindow) + if ( m_mouseInWindow ) { POINT pt; ::GetCursorPos(&pt); - if (::WindowFromPoint(pt) != (HWND) GetHWND()) + if ( ::WindowFromPoint(pt) != GetHwnd() ) { // Generate a LEAVE event m_mouseInWindow = FALSE; + // Unfortunately the mouse button and keyboard state may have changed + // by the time the OnIdle function is called, so 'state' may be + // meaningless. int state = 0; - if (::GetKeyState(VK_SHIFT) != 0) + if ( ::GetKeyState(VK_SHIFT) != 0 ) state |= MK_SHIFT; - if (::GetKeyState(VK_CONTROL) != 0) + if ( ::GetKeyState(VK_CONTROL) != 0 ) state |= MK_CONTROL; - // Unfortunately the mouse button and keyboard state may have changed - // by the time the OnIdle function is called, so 'state' may be - // meaningless. + wxMouseEvent event(wxEVT_LEAVE_WINDOW); + InitMouseEvent(event, pt.x, pt.y, state); - MSWOnMouseLeave(pt.x, pt.y, state); + (void)GetEventHandler()->ProcessEvent(event); } } + UpdateWindowUI(); } // Raise the window to the top of the Z order void wxWindow::Raise() { - ::BringWindowToTop((HWND) GetHWND()); + ::BringWindowToTop(GetHwnd()); } // Lower the window to the bottom of the Z order void wxWindow::Lower() { - ::SetWindowPos((HWND) GetHWND(), HWND_BOTTOM, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE|SWP_NOACTIVATE); -} - -long wxWindow::MSWGetDlgCode() -{ - // default: just forward to def window proc (the msg has no parameters) - return MSWDefWindowProc(WM_GETDLGCODE, 0, 0); -} - -bool wxWindow::AcceptsFocus() const -{ - // invisible and disabled controls don't need focus - return IsShown() && IsEnabled(); -} - -// Update region access -wxRegion wxWindow::GetUpdateRegion() const -{ - return m_updateRegion; -} - -bool wxWindow::IsExposed(int x, int y, int w, int h) const -{ - return (m_updateRegion.Contains(x, y, w, h) != wxOutRegion); -} - -bool wxWindow::IsExposed(const wxPoint& pt) const -{ - return (m_updateRegion.Contains(pt) != wxOutRegion); -} - -bool wxWindow::IsExposed(const wxRect& rect) const -{ - return (m_updateRegion.Contains(rect) != wxOutRegion); + ::SetWindowPos(GetHwnd(), HWND_BOTTOM, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE|SWP_NOACTIVATE); } // Set this window to be the child of 'parent'. bool wxWindow::Reparent(wxWindow *parent) { - if (parent == GetParent()) - return TRUE; - - // Unlink this window from the existing parent. - if (GetParent()) - { - GetParent()->RemoveChild(this); - } - else - wxTopLevelWindows.DeleteObject(this); + if ( !wxWindowBase::Reparent(parent) ) + return FALSE; - HWND hWndParent = 0; - HWND hWndChild = (HWND) GetHWND(); - if (parent != (wxWindow*) NULL) - { - parent->AddChild(this); - hWndParent = (HWND) parent->GetHWND(); - } - else - wxTopLevelWindows.Append(this); + HWND hWndChild = GetHwnd(); + HWND hWndParent = GetParent() ? GetWinHwnd(GetParent()) : (HWND)0; ::SetParent(hWndChild, hWndParent);