From: Włodzimierz Skiba Date: Thu, 26 Jan 2006 17:20:50 +0000 (+0000) Subject: Include order is wxprec.h=>defs.h=>platform.h=>setup.h so remove explicit setup.h... X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/b73e73f912a51b8be582b8bc987bb47fb5fc543a?ds=inline Include order is wxprec.h=>defs.h=>platform.h=>setup.h so remove explicit setup.h inclusion not touched by chckconf.h. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37164 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/generic/colrdlgg.h b/include/wx/generic/colrdlgg.h index ec09183de4..06feb75ffa 100644 --- a/include/wx/generic/colrdlgg.h +++ b/include/wx/generic/colrdlgg.h @@ -12,7 +12,7 @@ #ifndef __COLORDLGH_G__ #define __COLORDLGH_G__ -#include "wx/setup.h" +#include "wx/defs.h" #include "wx/gdicmn.h" #include "wx/dialog.h" #include "wx/cmndata.h" diff --git a/include/wx/generic/fontdlgg.h b/include/wx/generic/fontdlgg.h index beb004b4b9..f39d3c6574 100644 --- a/include/wx/generic/fontdlgg.h +++ b/include/wx/generic/fontdlgg.h @@ -12,7 +12,7 @@ #ifndef _WX_GENERIC_FONTDLGG_H #define _WX_GENERIC_FONTDLGG_H -#include "wx/setup.h" +#include "wx/defs.h" #include "wx/gdicmn.h" #include "wx/font.h" #include "wx/dialog.h" @@ -90,4 +90,3 @@ WXDLLEXPORT int wxFontWeightStringToInt(wxChar *weight); WXDLLEXPORT int wxFontStyleStringToInt(wxChar *style); #endif // _WX_GENERIC_FONTDLGG_H - diff --git a/include/wx/generic/msgdlgg.h b/include/wx/generic/msgdlgg.h index 85220f9e10..d9fa1cc712 100644 --- a/include/wx/generic/msgdlgg.h +++ b/include/wx/generic/msgdlgg.h @@ -12,7 +12,7 @@ #ifndef __MSGDLGH_G__ #define __MSGDLGH_G__ -#include "wx/setup.h" +#include "wx/defs.h" #include "wx/dialog.h" // type is an 'or' (|) of wxOK, wxCANCEL, wxYES_NO diff --git a/include/wx/gtk/colordlg.h b/include/wx/gtk/colordlg.h index 107b3ca9ed..84f3e6b413 100644 --- a/include/wx/gtk/colordlg.h +++ b/include/wx/gtk/colordlg.h @@ -12,7 +12,7 @@ #ifndef __COLORDLG_H__ #define __COLORDLG_H__ -#include "wx/setup.h" +#include "wx/defs.h" #include "wx/gdicmn.h" #include "wx/dialog.h" #include "wx/cmndata.h" @@ -44,7 +44,7 @@ protected: // copy data between the dialog and m_colourData: void ColourDataToDialog(); void DialogToColourData(); - + wxColourData m_data; DECLARE_DYNAMIC_CLASS(wxColourDialog) diff --git a/include/wx/gtk/msgdlg.h b/include/wx/gtk/msgdlg.h index 596deaad08..dbbcf9eb93 100644 --- a/include/wx/gtk/msgdlg.h +++ b/include/wx/gtk/msgdlg.h @@ -12,7 +12,7 @@ #ifndef __MSGDLG_H__ #define __MSGDLG_H__ -#include "wx/setup.h" +#include "wx/defs.h" #include "wx/dialog.h" // type is an 'or' (|) of wxOK, wxCANCEL, wxYES_NO diff --git a/include/wx/gtk1/colordlg.h b/include/wx/gtk1/colordlg.h index 5c20ca2e62..467ecd91d3 100644 --- a/include/wx/gtk1/colordlg.h +++ b/include/wx/gtk1/colordlg.h @@ -12,7 +12,7 @@ #ifndef __COLORDLG_H__ #define __COLORDLG_H__ -#include "wx/setup.h" +#include "wx/defs.h" #include "wx/gdicmn.h" #include "wx/dialog.h" #include "wx/cmndata.h" diff --git a/include/wx/gtk1/msgdlg.h b/include/wx/gtk1/msgdlg.h index 596deaad08..f335b676aa 100644 --- a/include/wx/gtk1/msgdlg.h +++ b/include/wx/gtk1/msgdlg.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/msgdlg.h +// Name: wx/gtk1/msgdlg.h // Purpose: wxMessageDialog for GTK+2 // Author: Vaclav Slavik // Modified by: @@ -12,7 +12,7 @@ #ifndef __MSGDLG_H__ #define __MSGDLG_H__ -#include "wx/setup.h" +#include "wx/defs.h" #include "wx/dialog.h" // type is an 'or' (|) of wxOK, wxCANCEL, wxYES_NO diff --git a/include/wx/mac/carbon/colordlg.h b/include/wx/mac/carbon/colordlg.h index 57b09a5e14..402547bdf8 100644 --- a/include/wx/mac/carbon/colordlg.h +++ b/include/wx/mac/carbon/colordlg.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: colordlg.h +// Name: wx/mac/carbon/colordlg.h // Purpose: wxColourDialog class. Use generic version if no // platform-specific implementation. // Author: Stefan Csomor @@ -13,7 +13,7 @@ #ifndef _WX_COLORDLG_H_ #define _WX_COLORDLG_H_ -#include "wx/setup.h" +#include "wx/defs.h" #include "wx/dialog.h" #include "wx/cmndata.h" diff --git a/include/wx/mac/carbon/glcanvas.h b/include/wx/mac/carbon/glcanvas.h index ec86d786ca..be7f16eb3d 100644 --- a/include/wx/mac/carbon/glcanvas.h +++ b/include/wx/mac/carbon/glcanvas.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: glcanvas.h +// Name: wx/mac/carbon/glcanvas.h // Purpose: wxGLCanvas, for using OpenGL with wxWidgets under Macintosh // Author: Stefan Csomor // Modified by: @@ -12,7 +12,7 @@ #ifndef _WX_GLCANVAS_H_ #define _WX_GLCANVAS_H_ -#include "wx/setup.h" +#include "wx/defs.h" #if wxUSE_GLCANVAS @@ -57,7 +57,7 @@ class WXDLLEXPORT wxGLCanvas; /* forward reference */ class WXDLLEXPORT wxGLContext: public wxObject { public: - wxGLContext(AGLPixelFormat fmt, wxGLCanvas *win, + wxGLContext(AGLPixelFormat fmt, wxGLCanvas *win, const wxPalette& WXUNUSED(palette), const wxGLContext *other /* for sharing display lists */ ); @@ -82,16 +82,16 @@ class WXDLLEXPORT wxGLCanvas: public wxWindow { DECLARE_CLASS(wxGLCanvas) public: - wxGLCanvas(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, + wxGLCanvas(wxWindow *parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = wxT("GLCanvas") , int *attribList = 0, const wxPalette& palette = wxNullPalette); wxGLCanvas( wxWindow *parent, const wxGLContext *shared, - wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = wxT("GLCanvas"), + wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = wxT("GLCanvas"), int *attribList = (int*) NULL, const wxPalette& palette = wxNullPalette ); - wxGLCanvas( wxWindow *parent, const wxGLCanvas *shared, wxWindowID id = -1, - const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, + wxGLCanvas( wxWindow *parent, const wxGLCanvas *shared, wxWindowID id = wxID_ANY, + const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = wxT("GLCanvas"), int *attribList = 0, const wxPalette& palette = wxNullPalette ); ~wxGLCanvas(); @@ -105,24 +105,24 @@ class WXDLLEXPORT wxGLCanvas: public wxWindow void SwapBuffers(); void UpdateContext(); void SetViewport(); - virtual bool Show(bool show = TRUE) ; - + virtual bool Show(bool show = true) ; + // Unlike some other platforms, this must get called if you override it. // It sets the viewport correctly and update the context. // You shouldn't call glViewport yourself either (use SetViewport if you must reset it.) void OnSize(wxSizeEvent& event); - - virtual void MacSuperChangedPosition() ; - virtual void MacTopLevelWindowChangedPosition() ; - virtual void MacVisibilityChanged() ; - void MacUpdateView() ; + virtual void MacSuperChangedPosition() ; + virtual void MacTopLevelWindowChangedPosition() ; + virtual void MacVisibilityChanged() ; + + void MacUpdateView() ; inline wxGLContext* GetContext() const { return m_glContext; } protected: wxGLContext* m_glContext; - bool m_macCanvasIsShown ; + bool m_macCanvasIsShown ; DECLARE_EVENT_TABLE() }; diff --git a/include/wx/mac/carbon/menuitem.h b/include/wx/mac/carbon/menuitem.h index 99af92053e..17e5362089 100644 --- a/include/wx/mac/carbon/menuitem.h +++ b/include/wx/mac/carbon/menuitem.h @@ -1,8 +1,8 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: menuitem.h +// Name: wx/mac/carbon/menuitem.h // Purpose: wxMenuItem class // Author: Vadim Zeitlin -// Modified by: +// Modified by: // Created: 11.11.97 // RCS-ID: $Id$ // Copyright: (c) 1998 Vadim Zeitlin @@ -16,7 +16,7 @@ // headers // ---------------------------------------------------------------------------- -#include "wx/setup.h" +#include "wx/defs.h" // ---------------------------------------------------------------------------- // wxMenuItem: an item in the menu, optionally implements owner-drawn behaviour @@ -36,8 +36,8 @@ public: // override base class virtuals virtual void SetText(const wxString& strName); - virtual void Enable(bool bDoEnable = TRUE); - virtual void Check(bool bDoCheck = TRUE); + virtual void Enable(bool bDoEnable = true); + virtual void Check(bool bDoCheck = true); virtual void SetBitmap(const wxBitmap& bitmap) ; virtual const wxBitmap& GetBitmap() const { return m_bitmap; } @@ -54,7 +54,7 @@ public: private: void UncheckRadio() ; - + // the positions of the first and last items of the radio group this item // belongs to or -1: start is the radio group start and is valid for all // but first radio group items (m_isRadioGroupStart == FALSE), end is valid diff --git a/include/wx/mac/carbon/msgdlg.h b/include/wx/mac/carbon/msgdlg.h index cdeb7fd085..bdffe148bd 100644 --- a/include/wx/mac/carbon/msgdlg.h +++ b/include/wx/mac/carbon/msgdlg.h @@ -13,7 +13,7 @@ #ifndef _WX_MSGBOXDLG_H_ #define _WX_MSGBOXDLG_H_ -#include "wx/setup.h" +#include "wx/defs.h" #include "wx/dialog.h" /* diff --git a/include/wx/mac/classic/colordlg.h b/include/wx/mac/classic/colordlg.h index 57b09a5e14..542170ec2a 100644 --- a/include/wx/mac/classic/colordlg.h +++ b/include/wx/mac/classic/colordlg.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: colordlg.h +// Name: wx/mac/classic/colordlg.h // Purpose: wxColourDialog class. Use generic version if no // platform-specific implementation. // Author: Stefan Csomor @@ -13,7 +13,7 @@ #ifndef _WX_COLORDLG_H_ #define _WX_COLORDLG_H_ -#include "wx/setup.h" +#include "wx/defs.h" #include "wx/dialog.h" #include "wx/cmndata.h" diff --git a/include/wx/mac/classic/glcanvas.h b/include/wx/mac/classic/glcanvas.h index f2e304ff99..53f7a8c73c 100644 --- a/include/wx/mac/classic/glcanvas.h +++ b/include/wx/mac/classic/glcanvas.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: glcanvas.h +// Name: wx/mac/classic/glcanvas.h // Purpose: wxGLCanvas, for using OpenGL with wxWidgets under Macintosh // Author: Stefan Csomor // Modified by: @@ -12,7 +12,7 @@ #ifndef _WX_GLCANVAS_H_ #define _WX_GLCANVAS_H_ -#include "wx/setup.h" +#include "wx/defs.h" #if wxUSE_GLCANVAS @@ -57,7 +57,7 @@ class WXDLLEXPORT wxGLCanvas; /* forward reference */ class WXDLLEXPORT wxGLContext: public wxObject { public: - wxGLContext(AGLPixelFormat fmt, wxGLCanvas *win, + wxGLContext(AGLPixelFormat fmt, wxGLCanvas *win, const wxPalette& WXUNUSED(palette), const wxGLContext *other /* for sharing display lists */ ); @@ -82,16 +82,16 @@ class WXDLLEXPORT wxGLCanvas: public wxWindow { DECLARE_CLASS(wxGLCanvas) public: - wxGLCanvas(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, + wxGLCanvas(wxWindow *parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = wxT("GLCanvas") , int *attribList = 0, const wxPalette& palette = wxNullPalette); wxGLCanvas( wxWindow *parent, const wxGLContext *shared, - wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = wxT("GLCanvas"), + wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = wxT("GLCanvas"), int *attribList = (int*) NULL, const wxPalette& palette = wxNullPalette ); - wxGLCanvas( wxWindow *parent, const wxGLCanvas *shared, wxWindowID id = -1, - const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, + wxGLCanvas( wxWindow *parent, const wxGLCanvas *shared, wxWindowID id = wxID_ANY, + const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = wxT("GLCanvas"), int *attribList = 0, const wxPalette& palette = wxNullPalette ); ~wxGLCanvas(); @@ -105,24 +105,24 @@ class WXDLLEXPORT wxGLCanvas: public wxWindow void SwapBuffers(); void UpdateContext(); void SetViewport(); - virtual bool Show(bool show = TRUE) ; - + virtual bool Show(bool show = true) ; + // Unlike some other platforms, this must get called if you override it. // It sets the viewport correctly and update the context. // You shouldn't call glViewport yourself either (use SetViewport if you must reset it.) void OnSize(wxSizeEvent& event); - - virtual void MacSuperChangedPosition() ; - virtual void MacTopLevelWindowChangedPosition() ; - virtual void MacSuperShown( bool show ) ; - void MacUpdateView() ; + virtual void MacSuperChangedPosition() ; + virtual void MacTopLevelWindowChangedPosition() ; + virtual void MacSuperShown( bool show ) ; + + void MacUpdateView() ; inline wxGLContext* GetContext() const { return m_glContext; } protected: wxGLContext* m_glContext; - bool m_macCanvasIsShown ; + bool m_macCanvasIsShown ; DECLARE_EVENT_TABLE() }; diff --git a/include/wx/mac/classic/menuitem.h b/include/wx/mac/classic/menuitem.h index 99af92053e..94fb5e02c0 100644 --- a/include/wx/mac/classic/menuitem.h +++ b/include/wx/mac/classic/menuitem.h @@ -1,8 +1,8 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: menuitem.h +// Name: wx/mac/classic/menuitem.h // Purpose: wxMenuItem class // Author: Vadim Zeitlin -// Modified by: +// Modified by: // Created: 11.11.97 // RCS-ID: $Id$ // Copyright: (c) 1998 Vadim Zeitlin @@ -16,7 +16,7 @@ // headers // ---------------------------------------------------------------------------- -#include "wx/setup.h" +#include "wx/defs.h" // ---------------------------------------------------------------------------- // wxMenuItem: an item in the menu, optionally implements owner-drawn behaviour @@ -36,8 +36,8 @@ public: // override base class virtuals virtual void SetText(const wxString& strName); - virtual void Enable(bool bDoEnable = TRUE); - virtual void Check(bool bDoCheck = TRUE); + virtual void Enable(bool bDoEnable = true); + virtual void Check(bool bDoCheck = true); virtual void SetBitmap(const wxBitmap& bitmap) ; virtual const wxBitmap& GetBitmap() const { return m_bitmap; } @@ -54,7 +54,7 @@ public: private: void UncheckRadio() ; - + // the positions of the first and last items of the radio group this item // belongs to or -1: start is the radio group start and is valid for all // but first radio group items (m_isRadioGroupStart == FALSE), end is valid diff --git a/include/wx/mac/classic/msgdlg.h b/include/wx/mac/classic/msgdlg.h index c49e755729..458281ba97 100644 --- a/include/wx/mac/classic/msgdlg.h +++ b/include/wx/mac/classic/msgdlg.h @@ -13,7 +13,7 @@ #ifndef _WX_MSGBOXDLG_H_ #define _WX_MSGBOXDLG_H_ -#include "wx/setup.h" +#include "wx/defs.h" #include "wx/dialog.h" /* diff --git a/include/wx/motif/msgdlg.h b/include/wx/motif/msgdlg.h index 12e013922c..e479425a70 100644 --- a/include/wx/motif/msgdlg.h +++ b/include/wx/motif/msgdlg.h @@ -13,7 +13,7 @@ #ifndef _WX_MSGBOXDLG_H_ #define _WX_MSGBOXDLG_H_ -#include "wx/setup.h" +#include "wx/defs.h" #include "wx/dialog.h" // ---------------------------------------------------------------------------- diff --git a/include/wx/msw/colordlg.h b/include/wx/msw/colordlg.h index 23cb6a6a62..e7dc6d2f70 100644 --- a/include/wx/msw/colordlg.h +++ b/include/wx/msw/colordlg.h @@ -12,7 +12,7 @@ #ifndef _WX_COLORDLG_H_ #define _WX_COLORDLG_H_ -#include "wx/setup.h" +#include "wx/defs.h" #include "wx/dialog.h" #include "wx/cmndata.h" diff --git a/include/wx/msw/msgdlg.h b/include/wx/msw/msgdlg.h index c3cc3dd05e..a20b51b2ae 100644 --- a/include/wx/msw/msgdlg.h +++ b/include/wx/msw/msgdlg.h @@ -12,7 +12,7 @@ #ifndef _WX_MSGBOXDLG_H_ #define _WX_MSGBOXDLG_H_ -#include "wx/setup.h" +#include "wx/defs.h" #include "wx/dialog.h" /* diff --git a/include/wx/os2/menuitem.h b/include/wx/os2/menuitem.h index 2f35885c5d..1e9d1d89b8 100644 --- a/include/wx/os2/menuitem.h +++ b/include/wx/os2/menuitem.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: menuitem.h +// Name: wx/os2/menuitem.h // Purpose: wxMenuItem class // Author: Vadim Zeitlin // Modified by: @@ -16,7 +16,7 @@ // headers // ---------------------------------------------------------------------------- -#include "wx/setup.h" +#include "wx/defs.h" // an exception to the general rule that a normal header doesn't include other // headers - only because ownerdrw.h is not always included and I don't want @@ -67,8 +67,8 @@ public: virtual void SetText(const wxString& rStrName); virtual void SetCheckable(bool bCheckable); - virtual void Enable(bool bDoEnable = TRUE); - virtual void Check(bool bDoCheck = TRUE); + virtual void Enable(bool bDoEnable = true); + virtual void Check(bool bDoCheck = true); virtual bool IsChecked(void) const; // diff --git a/include/wx/os2/msgdlg.h b/include/wx/os2/msgdlg.h index b3e236e012..0a08854cbf 100644 --- a/include/wx/os2/msgdlg.h +++ b/include/wx/os2/msgdlg.h @@ -13,7 +13,7 @@ #ifndef _WX_MSGBOXDLG_H_ #define _WX_MSGBOXDLG_H_ -#include "wx/setup.h" +#include "wx/defs.h" #include "wx/dialog.h" /* diff --git a/include/wx/palmos/colordlg.h b/include/wx/palmos/colordlg.h index 9bb16557f4..d215250f99 100644 --- a/include/wx/palmos/colordlg.h +++ b/include/wx/palmos/colordlg.h @@ -12,7 +12,7 @@ #ifndef _WX_COLORDLG_H_ #define _WX_COLORDLG_H_ -#include "wx/setup.h" +#include "wx/defs.h" #include "wx/dialog.h" #include "wx/cmndata.h" diff --git a/include/wx/palmos/msgdlg.h b/include/wx/palmos/msgdlg.h index e191ad69bc..621b297b92 100644 --- a/include/wx/palmos/msgdlg.h +++ b/include/wx/palmos/msgdlg.h @@ -12,7 +12,7 @@ #ifndef _WX_MSGBOXDLG_H_ #define _WX_MSGBOXDLG_H_ -#include "wx/setup.h" +#include "wx/defs.h" #include "wx/dialog.h" /* diff --git a/include/wx/x11/glcanvas.h b/include/wx/x11/glcanvas.h index 11767987ff..266be112a3 100644 --- a/include/wx/x11/glcanvas.h +++ b/include/wx/x11/glcanvas.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: glcanvas.h +// Name: wx/x11/glcanvas.h // Purpose: wxGLCanvas, for using OpenGL with wxWidgets 2.0 for Motif. // Uses the GLX extension. // Author: Julian Smart and Wolfram Gloger @@ -7,13 +7,13 @@ // Created: 1995, 1999 // RCS-ID: $Id$ // Copyright: (c) Julian Smart, Wolfram Gloger -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_GLCANVAS_H_ #define _WX_GLCANVAS_H_ -#include "wx/setup.h" +#include "wx/defs.h" #if wxUSE_GLCANVAS @@ -26,21 +26,21 @@ enum { WX_GL_RGBA=1, /* use true color palette */ - WX_GL_BUFFER_SIZE, /* bits for buffer if not WX_GL_RGBA */ - WX_GL_LEVEL, /* 0 for main buffer, >0 for overlay, <0 for underlay */ - WX_GL_DOUBLEBUFFER, /* use doublebuffer */ - WX_GL_STEREO, /* use stereoscopic display */ - WX_GL_AUX_BUFFERS, /* number of auxiliary buffers */ - WX_GL_MIN_RED, /* use red buffer with most bits (> MIN_RED bits) */ - WX_GL_MIN_GREEN, /* use green buffer with most bits (> MIN_GREEN bits) */ - WX_GL_MIN_BLUE, /* use blue buffer with most bits (> MIN_BLUE bits) */ - WX_GL_MIN_ALPHA, /* use blue buffer with most bits (> MIN_ALPHA bits) */ - WX_GL_DEPTH_SIZE, /* bits for Z-buffer (0,16,32) */ - WX_GL_STENCIL_SIZE, /* bits for stencil buffer */ - WX_GL_MIN_ACCUM_RED, /* use red accum buffer with most bits (> MIN_ACCUM_RED bits) */ - WX_GL_MIN_ACCUM_GREEN, /* use green buffer with most bits (> MIN_ACCUM_GREEN bits) */ - WX_GL_MIN_ACCUM_BLUE, /* use blue buffer with most bits (> MIN_ACCUM_BLUE bits) */ - WX_GL_MIN_ACCUM_ALPHA /* use blue buffer with most bits (> MIN_ACCUM_ALPHA bits) */ + WX_GL_BUFFER_SIZE, /* bits for buffer if not WX_GL_RGBA */ + WX_GL_LEVEL, /* 0 for main buffer, >0 for overlay, <0 for underlay */ + WX_GL_DOUBLEBUFFER, /* use doublebuffer */ + WX_GL_STEREO, /* use stereoscopic display */ + WX_GL_AUX_BUFFERS, /* number of auxiliary buffers */ + WX_GL_MIN_RED, /* use red buffer with most bits (> MIN_RED bits) */ + WX_GL_MIN_GREEN, /* use green buffer with most bits (> MIN_GREEN bits) */ + WX_GL_MIN_BLUE, /* use blue buffer with most bits (> MIN_BLUE bits) */ + WX_GL_MIN_ALPHA, /* use blue buffer with most bits (> MIN_ALPHA bits) */ + WX_GL_DEPTH_SIZE, /* bits for Z-buffer (0,16,32) */ + WX_GL_STENCIL_SIZE, /* bits for stencil buffer */ + WX_GL_MIN_ACCUM_RED, /* use red accum buffer with most bits (> MIN_ACCUM_RED bits) */ + WX_GL_MIN_ACCUM_GREEN, /* use green buffer with most bits (> MIN_ACCUM_GREEN bits) */ + WX_GL_MIN_ACCUM_BLUE, /* use blue buffer with most bits (> MIN_ACCUM_BLUE bits) */ + WX_GL_MIN_ACCUM_ALPHA /* use blue buffer with most bits (> MIN_ACCUM_ALPHA bits) */ }; //--------------------------------------------------------------------------- @@ -51,34 +51,34 @@ enum class WXDLLEXPORT wxGLContext: public wxObject { public: - wxGLContext( bool isRGB, wxWindow *win, + wxGLContext( bool isRGB, wxWindow *win, const wxPalette& palette = wxNullPalette ); - wxGLContext( bool WXUNUSED(isRGB), wxWindow *win, + wxGLContext( bool WXUNUSED(isRGB), wxWindow *win, const wxPalette& WXUNUSED(palette), const wxGLContext *other /* for sharing display lists */ ); ~wxGLContext(); - + void SetCurrent(); void SetColour(const wxChar *colour); void SwapBuffers(); - + void SetupPixelFormat(); void SetupPalette(const wxPalette& palette); wxPalette CreateDefaultPalette(); - + inline wxPalette* GetPalette() const { return (wxPalette*) & m_palette; } inline wxWindow* GetWindow() const { return m_window; } // inline GtkWidget* GetWidget() const { return m_widget; } inline GLXContext GetContext() const { return m_glContext; } - + public: GLXContext m_glContext; - + // GtkWidget *m_widget; wxPalette m_palette; wxWindow* m_window; - + DECLARE_CLASS(wxGLContext) }; @@ -93,61 +93,61 @@ public: m_vi = (void*) NULL; // m_exposed = FALSE; } - wxGLCanvas( wxWindow *parent, wxWindowID id = -1, + wxGLCanvas( wxWindow *parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, const wxString& name = wxT("GLCanvas"), - int *attribList = (int*) NULL, + const wxSize& size = wxDefaultSize, + long style = 0, const wxString& name = wxT("GLCanvas"), + int *attribList = (int*) NULL, const wxPalette& palette = wxNullPalette ); wxGLCanvas( wxWindow *parent, const wxGLContext *shared, - wxWindowID id = -1, + wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, const wxString& name = wxT("GLCanvas"), - int *attribList = (int*) NULL, + const wxSize& size = wxDefaultSize, + long style = 0, const wxString& name = wxT("GLCanvas"), + int *attribList = (int*) NULL, const wxPalette& palette = wxNullPalette ); wxGLCanvas( wxWindow *parent, const wxGLCanvas *shared, - wxWindowID id = -1, + wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, const wxString& name = wxT("GLCanvas"), - int *attribList = (int*) NULL, + const wxSize& size = wxDefaultSize, + long style = 0, const wxString& name = wxT("GLCanvas"), + int *attribList = (int*) NULL, const wxPalette& palette = wxNullPalette ); - - bool Create( wxWindow *parent, + + bool Create( wxWindow *parent, const wxGLContext *shared = (wxGLContext*)NULL, const wxGLCanvas *shared_context_of = (wxGLCanvas*)NULL, - wxWindowID id = -1, + wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, const wxString& name = wxT("GLCanvas"), + const wxSize& size = wxDefaultSize, + long style = 0, const wxString& name = wxT("GLCanvas"), int *attribList = (int*) NULL, const wxPalette& palette = wxNullPalette ); - + ~wxGLCanvas(); - + void SetCurrent(); void SetColour(const wxChar *colour); void SwapBuffers(); - + // void OnSize(wxSizeEvent& event); - + // void OnInternalIdle(); - - inline wxGLContext* GetContext() const { return m_glContext; } - + + inline wxGLContext* GetContext() const { return m_glContext; } + // implementation - + wxGLContext *m_glContext, *m_sharedContext; wxGLCanvas *m_sharedContextOf; void *m_vi; // GtkWidget *m_glWidget; // bool m_exposed; - + DECLARE_EVENT_TABLE() DECLARE_CLASS(wxGLCanvas) - + }; #endif