AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/wx/motif/window.h
View File

@ -122,6 +122,7 @@ public:
virtual WXWidget GetTopWidget() const;
// Get the underlying X window and display
WXWindow GetClientXWindow() const;
WXWindow GetXWindow() const;
WXDisplay *GetXDisplay() const;

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
{

27
src/x11/glcanvas.cpp
View File

@ -1,6 +1,6 @@
/////////////////////////////////////////////////////////////////////////////
// Name: glcanvas.cpp
// Purpose: wxGLCanvas, for using OpenGL with wxWindows 2.0 for Motif.
// Purpose: wxGLCanvas, for using OpenGL with wxWindows
// Uses the GLX extension.
// Author: Julian Smart and Wolfram Gloger
// Modified by:
@ -18,8 +18,6 @@
#if wxUSE_GLCANVAS
// #error Sorry, wxGLCanvas does not work yet with wxX11
#include "wx/glcanvas.h"
#include "wx/utils.h"
#include "wx/app.h"
@ -28,11 +26,20 @@
#ifdef __VMS
# pragma message disable nosimpint
#endif
#include <Xm/Xm.h>
#include <X11/Xlib.h>
#ifdef __VMS
# pragma message enable nosimpint
#endif
#include "wx/motif/private.h"
#include "wx/x11/private.h"
static inline WXWindow wxGetClientAreaWindow(wxWindow* win)
{
#ifdef __WXMOTIF__
return win->GetClientXWindow();
#else
return win->GetClientAreaWindow();
#endif
}
#ifdef OLD_MESA
// workaround for bug in Mesa's glx.c
@ -111,7 +118,7 @@ void wxGLContext::SwapBuffers()
if (m_glContext)
{
Display* display = (Display*) wxGetDisplay();
glXSwapBuffers(display, (Window) m_window->GetClientAreaWindow());
glXSwapBuffers(display, (Window) wxGetClientAreaWindow(m_window));
}
}
@ -120,7 +127,7 @@ void wxGLContext::SetCurrent()
if (m_glContext)
{
Display* display = (Display*) wxGetDisplay();
glXMakeCurrent(display, (Window) m_window->GetClientAreaWindow(),
glXMakeCurrent(display, (Window) wxGetClientAreaWindow(m_window),
m_glContext );;
}
}
@ -136,7 +143,11 @@ void wxGLContext::SetColour(const char *colour)
the_colour->Green(),
the_colour->Blue());
} else {
#ifdef __WXMOTIF__
the_colour->AllocColour(m_window->GetXDisplay());
#else
the_colour->CalcPixel(wxTheApp->GetMainColormap(wxGetDisplay()));
#endif
GLint pix = (GLint)the_colour->GetPixel();
if(pix == -1)
{
@ -297,7 +308,7 @@ bool wxGLCanvas::Create( wxWindow *parent,
} else {
// By default, we use the visual of xwindow
// NI: is this really senseful ? opengl in e.g. color index mode ?
XGetWindowAttributes(display, (Window) GetClientAreaWindow(), &xwa);
XGetWindowAttributes(display, (Window)wxGetClientAreaWindow(this), &xwa);
vi_templ.visualid = XVisualIDFromVisual(xwa.visual);
vi = XGetVisualInfo(display, VisualIDMask, &vi_templ, &n);
if(!vi) return FALSE;