Rename wxWindow::GetMainWindow() to X11GetMainWindow() in wxX11.
This avoids conflicts with GetMainWindow() defined in other wxWindow-derived classes (such as wxDataViewCtrl and potentially user-defined classes as well). Closes #11818. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63723 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -338,7 +338,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event)
|
||||
|
||||
// If we only have one X11 window, always indicate
|
||||
// that borders might have to be redrawn.
|
||||
if (win->GetMainWindow() == win->GetClientAreaWindow())
|
||||
if (win->X11GetMainWindow() == win->GetClientAreaWindow())
|
||||
win->NeedUpdateNcAreaInIdle();
|
||||
|
||||
// Only erase background, paint in idle time.
|
||||
|
Reference in New Issue
Block a user