Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't #include Motif headers from src/x11/glcanvas.cpp.

Browse Source 
prepare for using src/x11/glcanvas.cpp for wxMotif.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22130 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2003-07-19 22:07:15 +00:00
parent 9b51403d37
commit 1807c27dbc
3 changed files with 33 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/motif/window.cpp
View File

@@ -577,7 +577,7 @@ wxWindow *wxWindowBase::FindFocus()
// (2) The widget with the focus may not be in the widget table
// depending on which widgets I put in the table
wxWindow *winFocus = (wxWindow *)NULL;
for ( wxWindowList::Node *node = wxTopLevelWindows.GetFirst();
for ( wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetFirst();
node;
node = node->GetNext() )
{
@@ -904,7 +904,7 @@ void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect)
wxBrush brush(GetBackgroundColour(), wxSOLID);
dc.SetBrush(brush); // FIXME: needed?
wxWindowList::Node *cnode = m_children.GetFirst();
wxWindowList::compatibility_iterator cnode = m_children.GetFirst();
while (cnode)
{
wxWindow *child = cnode->GetData();
@@ -1000,7 +1000,7 @@ void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect)
// Now send expose events
wxList::Node* node = updateRects.GetFirst();
wxList::compatibility_iterator node = updateRects.GetFirst();
while (node)
{
wxRect* rect = (wxRect*) node->GetData();
@@ -1666,7 +1666,7 @@ void wxWindow::DoPaint()
// Responds to colour changes: passes event on to children.
void wxWindow::OnSysColourChanged(wxSysColourChangedEvent& event)
{
wxWindowList::Node *node = GetChildren().GetFirst();
wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
while ( node )
{
// Only propagate to non-top-level windows
@@ -1867,6 +1867,15 @@ bool wxWindow::DetachWidget(WXWidget widget)
// Motif-specific accessors
// ----------------------------------------------------------------------------
WXWindow wxWindow::GetClientXWindow() const
{
Widget wMain = (Widget)GetClientWidget();
if ( wMain )
return (WXWindow) XtWindow(wMain);
else
return (WXWindow) 0;
}
// Get the underlying X window
WXWindow wxWindow::GetXWindow() const
{