Added test for wxTreeCtrl::GetChildrenCount()
Fixed Reparent (added heaps of debug code for this) Small mods to glcanvas git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3799 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -242,8 +242,6 @@ bool wxGLCanvas::Create( wxWindow *parent,
|
||||
XFree( g_vi );
|
||||
g_vi = (XVisualInfo*) NULL;
|
||||
|
||||
// gdk_window_set_back_pixmap( m_glWidget->window, None, 0 );
|
||||
|
||||
/* we pretend to have a m_wxwindow so that PostCreation hooks
|
||||
up the events for expose and draw */
|
||||
m_wxwindow = m_glWidget;
|
||||
@@ -269,10 +267,10 @@ void wxGLCanvas::OnSize(wxSizeEvent& WXUNUSED(event))
|
||||
{
|
||||
int width, height;
|
||||
GetClientSize( &width, &height );
|
||||
|
||||
if (m_glContext && GTK_WIDGET_REALIZED(m_glWidget) )
|
||||
{
|
||||
SetCurrent();
|
||||
// gdk_window_set_back_pixmap( gtk_widget_get_parent_window(m_glWidget), None, 0 );
|
||||
|
||||
glViewport(0, 0, (GLint)width, (GLint)height );
|
||||
glMatrixMode(GL_PROJECTION);
|
||||
|
@@ -54,10 +54,7 @@ class wxGLCanvas;
|
||||
|
||||
class wxGLContext: public wxObject
|
||||
{
|
||||
DECLARE_CLASS(wxGLContext)
|
||||
|
||||
public:
|
||||
|
||||
public:
|
||||
wxGLContext( bool isRGB, wxWindow *win, const wxPalette& palette = wxNullPalette );
|
||||
wxGLContext(
|
||||
bool WXUNUSED(isRGB), wxWindow *win,
|
||||
@@ -79,13 +76,15 @@ class wxGLContext: public wxObject
|
||||
inline GtkWidget* GetWidget() const { return m_widget; }
|
||||
inline GLXContext GetContext() const { return m_glContext; }
|
||||
|
||||
public:
|
||||
|
||||
public:
|
||||
GLXContext m_glContext;
|
||||
|
||||
GtkWidget *m_widget;
|
||||
wxPalette m_palette;
|
||||
wxWindow* m_window;
|
||||
|
||||
private:
|
||||
DECLARE_CLASS(wxGLContext)
|
||||
};
|
||||
|
||||
//---------------------------------------------------------------------------
|
||||
@@ -94,9 +93,7 @@ class wxGLContext: public wxObject
|
||||
|
||||
class wxGLCanvas: public wxScrolledWindow
|
||||
{
|
||||
DECLARE_CLASS(wxGLCanvas)
|
||||
|
||||
public:
|
||||
public:
|
||||
wxGLCanvas( wxWindow *parent, wxWindowID id = -1,
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& size = wxDefaultSize,
|
||||
@@ -137,7 +134,9 @@ class wxGLCanvas: public wxScrolledWindow
|
||||
wxGLContext *m_glContext;
|
||||
GtkWidget *m_glWidget;
|
||||
|
||||
DECLARE_EVENT_TABLE()
|
||||
private:
|
||||
DECLARE_EVENT_TABLE()
|
||||
DECLARE_CLASS(wxGLCanvas)
|
||||
};
|
||||
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user