Added some Motif wxGLCanvas support; some more Motif bugs cured; print dialogs
look OK on Motif now; got rid of some #ifdef wxUSE_... instances git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1459 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -106,7 +106,9 @@ void TestGLCanvas::OnPaint( wxPaintEvent& event )
|
||||
// OnPaint handlers must always create a wxPaintDC.
|
||||
wxPaintDC dc(this);
|
||||
|
||||
#ifndef __WXMOTIF__
|
||||
if (!GetContext()) return;
|
||||
#endif
|
||||
|
||||
SetCurrent();
|
||||
|
||||
@@ -155,7 +157,9 @@ void TestGLCanvas::OnSize(wxSizeEvent& event)
|
||||
int width, height;
|
||||
GetClientSize(& width, & height);
|
||||
|
||||
#ifndef __WXMOTIF__
|
||||
if (GetContext())
|
||||
#endif
|
||||
{
|
||||
SetCurrent();
|
||||
glViewport(0, 0, width, height);
|
||||
|
@@ -255,13 +255,13 @@ bool MyApp::OnInit(void)
|
||||
#endif
|
||||
|
||||
if(!doubleBuffer
|
||||
#ifdef __X__ // JACS
|
||||
#ifdef __WXGTK__ // JACS
|
||||
|| !wxGLCanvas::HaveVisual(gl_attrib)
|
||||
#endif
|
||||
)
|
||||
{
|
||||
printf("don't have double buffer, disabling\n");
|
||||
#ifndef __WXMSW__
|
||||
#ifdef __WXGTK__
|
||||
gl_attrib[9] = None;
|
||||
#endif
|
||||
doubleBuffer = GL_FALSE;
|
||||
|
Reference in New Issue
Block a user