X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4fabb57533169f2f75367e0d120c762518548890..1e6d94998fcbdb3ce60774e38c0d4b6ee20c6798:/src/msw/window.cpp diff --git a/src/msw/window.cpp b/src/msw/window.cpp index 32eb0c46bf..6a20945ba8 100644 --- a/src/msw/window.cpp +++ b/src/msw/window.cpp @@ -95,23 +95,22 @@ wxWindow *wxFindWinFromHandle(WXHWND hWnd); #if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxEvtHandler) +#endif BEGIN_EVENT_TABLE(wxWindow, wxEvtHandler) -EVT_CHAR(wxWindow::OnChar) -EVT_ERASE_BACKGROUND(wxWindow::OnEraseBackground) -EVT_SYS_COLOUR_CHANGED(wxWindow::OnSysColourChanged) -EVT_INIT_DIALOG(wxWindow::OnInitDialog) -EVT_IDLE(wxWindow::OnIdle) + EVT_CHAR(wxWindow::OnChar) + EVT_ERASE_BACKGROUND(wxWindow::OnEraseBackground) + EVT_SYS_COLOUR_CHANGED(wxWindow::OnSysColourChanged) + EVT_INIT_DIALOG(wxWindow::OnInitDialog) + EVT_IDLE(wxWindow::OnIdle) END_EVENT_TABLE() -#endif - // Find an item given the MS Windows id wxWindow *wxWindow::FindItem(int id) const { - if (!GetChildren()) - return NULL; - wxNode *current = GetChildren()->First(); +// if (!GetChildren()) +// return NULL; + wxNode *current = GetChildren().First(); while (current) { wxWindow *childWin = (wxWindow *)current->Data(); @@ -140,9 +139,9 @@ wxWindow *wxWindow::FindItem(int id) const // Find an item given the MS Windows handle wxWindow *wxWindow::FindItemByHWND(WXHWND hWnd, bool controlOnly) const { - if (!GetChildren()) - return NULL; - wxNode *current = GetChildren()->First(); +// if (!GetChildren()) +// return NULL; + wxNode *current = GetChildren().First(); while (current) { wxObject *obj = (wxObject *)current->Data() ; @@ -364,8 +363,6 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id, long style, const wxString& name) { - Init(); - wxCHECK_MSG( parent, FALSE, "can't create wxWindow without parent" ); parent->AddChild(this); @@ -619,6 +616,12 @@ void wxWindow::SetSize(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) + return; + int actualWidth = width; int actualHeight = height; int actualX = x; @@ -630,8 +633,6 @@ void wxWindow::SetSize(int x, int y, int width, int height, int sizeFlags) AdjustForParentClientOrigin(actualX, actualY, sizeFlags); - int currentW,currentH; - GetSize(¤tW, ¤tH); if (width == -1) actualWidth = currentW ; if (height == -1) @@ -781,7 +782,7 @@ void wxWindow::GetTextExtent(const wxString& string, int *x, int *y, // fontToUse->ReleaseResource(); } -void wxWindow::Refresh(bool eraseBack, const wxRectangle *rect) +void wxWindow::Refresh(bool eraseBack, const wxRect *rect) { HWND hWnd = (HWND) GetHWND(); if (hWnd) @@ -1590,25 +1591,29 @@ long wxWindow::MSWOnNotify(WXWPARAM wParam, WXLPARAM lParam) if ( win ) { - win->MSWNotify(wParam, lParam, &result); + 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(); + wxNode *node = GetChildren().First(); while (node) { wxWindow *child = (wxWindow *)node->Data(); if ( child->MSWNotify(wParam, lParam, &result) ) - break; + return result; node = node->Next(); } - } - return result; + // finally try this window too (catches toolbar case) + if ( MSWNotify(wParam, lParam, &result) ) + return result; + } #endif // Win95 + // not processed return FALSE; } @@ -1817,7 +1822,7 @@ long wxWindow::MSWOnQueryNewPalette() // Responds to colour changes: passes event on to children. void wxWindow::OnSysColourChanged(wxSysColourChangedEvent& event) { - wxNode *node = GetChildren()->First(); + wxNode *node = GetChildren().First(); while ( node ) { // Only propagate to non-top-level windows @@ -2068,7 +2073,7 @@ void wxWindow::MSWOnLButtonDown(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 = wxEVENT_TYPE_LEFT_DOWN; + m_lastXPos = event.m_x; m_lastYPos = event.m_y; m_lastEvent = wxEVT_LEFT_DOWN; if (!GetEventHandler()->ProcessEvent(event)) Default(); @@ -3188,7 +3193,7 @@ int wxWindow::GetScrollRange(int orient) const #if defined(__WIN95__) // Try to adjust the range to cope with page size > 1 // - a Windows API quirk - int pageSize = GetScrollPage(orient); + int pageSize = GetScrollThumb(orient); if ( pageSize > 1 ) { maxPos -= (pageSize - 1); @@ -3310,7 +3315,7 @@ SetScrollPage(orient, thumbVisible, FALSE); } } -void wxWindow::ScrollWindow(int dx, int dy, const wxRectangle *rect) +void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect) { RECT rect2; if ( rect ) @@ -3492,7 +3497,7 @@ bool wxWindow::IsEnabled(void) const // it's an application error (pops up a dialog) bool wxWindow::TransferDataToWindow() { - wxNode *node = GetChildren()->First(); + wxNode *node = GetChildren().First(); while ( node ) { wxWindow *child = (wxWindow *)node->Data(); @@ -3512,7 +3517,7 @@ bool wxWindow::TransferDataToWindow() // validation failed: don't quit bool wxWindow::TransferDataFromWindow() { - wxNode *node = GetChildren()->First(); + wxNode *node = GetChildren().First(); while ( node ) { wxWindow *child = (wxWindow *)node->Data(); @@ -3528,7 +3533,7 @@ bool wxWindow::TransferDataFromWindow() bool wxWindow::Validate() { - wxNode *node = GetChildren()->First(); + wxNode *node = GetChildren().First(); while ( node ) { wxWindow *child = (wxWindow *)node->Data(); @@ -3555,30 +3560,28 @@ wxWindow *wxWindow::FindFocus() void wxWindow::AddChild(wxWindow *child) { - GetChildren()->Append(child); + GetChildren().Append(child); child->m_windowParent = this; } void wxWindow::RemoveChild(wxWindow *child) { - if (GetChildren()) - GetChildren()->DeleteObject(child); +// if (GetChildren()) + GetChildren().DeleteObject(child); child->m_windowParent = NULL; } void wxWindow::DestroyChildren() { - if (GetChildren()) { wxNode *node; - while ((node = GetChildren()->First()) != (wxNode *)NULL) { + while ((node = GetChildren().First()) != (wxNode *)NULL) { wxWindow *child; if ((child = (wxWindow *)node->Data()) != (wxWindow *)NULL) { delete child; - if ( GetChildren()->Member(child) ) + if ( GetChildren().Member(child) ) delete node; } } /* while */ - } } void wxWindow::MakeModal(bool modal) @@ -3793,7 +3796,7 @@ bool wxWindow::DoPhase(int phase) { noChanges = 0; noFailures = 0; - wxNode *node = GetChildren()->First(); + wxNode *node = GetChildren().First(); while (node) { wxWindow *child = (wxWindow *)node->Data(); @@ -3838,7 +3841,7 @@ void wxWindow::ResetConstraints() constr->centreX.SetDone(FALSE); constr->centreY.SetDone(FALSE); } - wxNode *node = GetChildren()->First(); + wxNode *node = GetChildren().First(); while (node) { wxWindow *win = (wxWindow *)node->Data(); @@ -3897,7 +3900,7 @@ void wxWindow::SetConstraintSizes(bool recurse) if (recurse) { - wxNode *node = GetChildren()->First(); + wxNode *node = GetChildren().First(); while (node) { wxWindow *win = (wxWindow *)node->Data(); @@ -4035,9 +4038,9 @@ bool wxWindow::Close(bool force) wxObject* wxWindow::GetChild(int number) const { // Return a pointer to the Nth object in the Panel - if (!GetChildren()) - return(NULL) ; - wxNode *node = GetChildren()->First(); +// if (!GetChildren()) +// return(NULL) ; + wxNode *node = GetChildren().First(); int n = number; while (node && n--) node = node->Next() ; @@ -4099,7 +4102,7 @@ void wxWindow::Fit() { int maxX = 0; int maxY = 0; - wxNode *node = GetChildren()->First(); + wxNode *node = GetChildren().First(); while ( node ) { wxWindow *win = (wxWindow *)node->Data(); @@ -4132,7 +4135,7 @@ wxWindow *wxWindow::FindWindow(long id) if ( GetId() == id) return this; - wxNode *node = GetChildren()->First(); + wxNode *node = GetChildren().First(); while ( node ) { wxWindow *child = (wxWindow *)node->Data(); @@ -4149,7 +4152,7 @@ wxWindow *wxWindow::FindWindow(const wxString& name) if ( GetName() == name) return this; - wxNode *node = GetChildren()->First(); + wxNode *node = GetChildren().First(); while ( node ) { wxWindow *child = (wxWindow *)node->Data();