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

Include order is wxprec.h=>defs.h=>platform.h=>setup.h so remove explicit setup.h inclusion not touched by chckconf.h.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37164 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-01-26 17:20:50 +00:00
parent 8498a2858b
commit b73e73f912
23 changed files with 132 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/generic/colrdlgg.h
View File

@@ -12,7 +12,7 @@
#ifndef __COLORDLGH_G__ #ifndef __COLORDLGH_G__
#define __COLORDLGH_G__ #define __COLORDLGH_G__
#include "wx/setup.h" #include "wx/defs.h"
#include "wx/gdicmn.h" #include "wx/gdicmn.h"
#include "wx/dialog.h" #include "wx/dialog.h"
#include "wx/cmndata.h" #include "wx/cmndata.h"

3
include/wx/generic/fontdlgg.h
View File

@@ -12,7 +12,7 @@
#ifndef _WX_GENERIC_FONTDLGG_H #ifndef _WX_GENERIC_FONTDLGG_H
#define _WX_GENERIC_FONTDLGG_H #define _WX_GENERIC_FONTDLGG_H
#include "wx/setup.h" #include "wx/defs.h"
#include "wx/gdicmn.h" #include "wx/gdicmn.h"
#include "wx/font.h" #include "wx/font.h"
#include "wx/dialog.h" #include "wx/dialog.h"
@@ -90,4 +90,3 @@ WXDLLEXPORT int wxFontWeightStringToInt(wxChar *weight);
WXDLLEXPORT int wxFontStyleStringToInt(wxChar *style); WXDLLEXPORT int wxFontStyleStringToInt(wxChar *style);
#endif // _WX_GENERIC_FONTDLGG_H #endif // _WX_GENERIC_FONTDLGG_H

2
include/wx/generic/msgdlgg.h
View File

@@ -12,7 +12,7 @@
#ifndef __MSGDLGH_G__ #ifndef __MSGDLGH_G__
#define __MSGDLGH_G__ #define __MSGDLGH_G__
#include "wx/setup.h" #include "wx/defs.h"
#include "wx/dialog.h" #include "wx/dialog.h"
// type is an 'or' (|) of wxOK, wxCANCEL, wxYES_NO // type is an 'or' (|) of wxOK, wxCANCEL, wxYES_NO

4
include/wx/gtk/colordlg.h
View File

@@ -12,7 +12,7 @@
#ifndef __COLORDLG_H__ #ifndef __COLORDLG_H__
#define __COLORDLG_H__ #define __COLORDLG_H__
#include "wx/setup.h" #include "wx/defs.h"
#include "wx/gdicmn.h" #include "wx/gdicmn.h"
#include "wx/dialog.h" #include "wx/dialog.h"
#include "wx/cmndata.h" #include "wx/cmndata.h"
@@ -44,7 +44,7 @@ protected:
// copy data between the dialog and m_colourData: // copy data between the dialog and m_colourData:
void ColourDataToDialog(); void ColourDataToDialog();
void DialogToColourData(); void DialogToColourData();
wxColourData m_data; wxColourData m_data;
DECLARE_DYNAMIC_CLASS(wxColourDialog) DECLARE_DYNAMIC_CLASS(wxColourDialog)

2
include/wx/gtk/msgdlg.h
View File

@@ -12,7 +12,7 @@
#ifndef __MSGDLG_H__ #ifndef __MSGDLG_H__
#define __MSGDLG_H__ #define __MSGDLG_H__
#include "wx/setup.h" #include "wx/defs.h"
#include "wx/dialog.h" #include "wx/dialog.h"
// type is an 'or' (|) of wxOK, wxCANCEL, wxYES_NO // type is an 'or' (|) of wxOK, wxCANCEL, wxYES_NO

2
include/wx/gtk1/colordlg.h
View File

@@ -12,7 +12,7 @@
#ifndef __COLORDLG_H__ #ifndef __COLORDLG_H__
#define __COLORDLG_H__ #define __COLORDLG_H__
#include "wx/setup.h" #include "wx/defs.h"
#include "wx/gdicmn.h" #include "wx/gdicmn.h"
#include "wx/dialog.h" #include "wx/dialog.h"
#include "wx/cmndata.h" #include "wx/cmndata.h"

4
include/wx/gtk1/msgdlg.h
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: wx/gtk/msgdlg.h // Name: wx/gtk1/msgdlg.h
// Purpose: wxMessageDialog for GTK+2 // Purpose: wxMessageDialog for GTK+2
// Author: Vaclav Slavik // Author: Vaclav Slavik
// Modified by: // Modified by:
@@ -12,7 +12,7 @@
#ifndef __MSGDLG_H__ #ifndef __MSGDLG_H__
#define __MSGDLG_H__ #define __MSGDLG_H__
#include "wx/setup.h" #include "wx/defs.h"
#include "wx/dialog.h" #include "wx/dialog.h"
// type is an 'or' (|) of wxOK, wxCANCEL, wxYES_NO // type is an 'or' (|) of wxOK, wxCANCEL, wxYES_NO

4
include/wx/mac/carbon/colordlg.h
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: colordlg.h // Name: wx/mac/carbon/colordlg.h
// Purpose: wxColourDialog class. Use generic version if no // Purpose: wxColourDialog class. Use generic version if no
// platform-specific implementation. // platform-specific implementation.
// Author: Stefan Csomor // Author: Stefan Csomor
@@ -13,7 +13,7 @@
#ifndef _WX_COLORDLG_H_ #ifndef _WX_COLORDLG_H_
#define _WX_COLORDLG_H_ #define _WX_COLORDLG_H_
#include "wx/setup.h" #include "wx/defs.h"
#include "wx/dialog.h" #include "wx/dialog.h"
#include "wx/cmndata.h" #include "wx/cmndata.h"

32
include/wx/mac/carbon/glcanvas.h
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: glcanvas.h // Name: wx/mac/carbon/glcanvas.h
// Purpose: wxGLCanvas, for using OpenGL with wxWidgets under Macintosh // Purpose: wxGLCanvas, for using OpenGL with wxWidgets under Macintosh
// Author: Stefan Csomor // Author: Stefan Csomor
// Modified by: // Modified by:
@@ -12,7 +12,7 @@
#ifndef _WX_GLCANVAS_H_ #ifndef _WX_GLCANVAS_H_
#define _WX_GLCANVAS_H_ #define _WX_GLCANVAS_H_
#include "wx/setup.h" #include "wx/defs.h"
#if wxUSE_GLCANVAS #if wxUSE_GLCANVAS
@@ -57,7 +57,7 @@ class WXDLLEXPORT wxGLCanvas; /* forward reference */
class WXDLLEXPORT wxGLContext: public wxObject class WXDLLEXPORT wxGLContext: public wxObject
{ {
public: public:
wxGLContext(AGLPixelFormat fmt, wxGLCanvas *win, wxGLContext(AGLPixelFormat fmt, wxGLCanvas *win,
const wxPalette& WXUNUSED(palette), const wxPalette& WXUNUSED(palette),
const wxGLContext *other /* for sharing display lists */ const wxGLContext *other /* for sharing display lists */
); );
@@ -82,16 +82,16 @@ class WXDLLEXPORT wxGLCanvas: public wxWindow
{ {
DECLARE_CLASS(wxGLCanvas) DECLARE_CLASS(wxGLCanvas)
public: 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 wxSize& size = wxDefaultSize, long style = 0,
const wxString& name = wxT("GLCanvas") , int *attribList = 0, const wxPalette& palette = wxNullPalette); const wxString& name = wxT("GLCanvas") , int *attribList = 0, const wxPalette& palette = wxNullPalette);
wxGLCanvas( wxWindow *parent, const wxGLContext *shared, wxGLCanvas( wxWindow *parent, const wxGLContext *shared,
wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, 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 ); int *attribList = (int*) NULL, const wxPalette& palette = wxNullPalette );
wxGLCanvas( wxWindow *parent, const wxGLCanvas *shared, wxWindowID id = -1, wxGLCanvas( wxWindow *parent, const wxGLCanvas *shared, wxWindowID id = wxID_ANY,
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0,
const wxString& name = wxT("GLCanvas"), int *attribList = 0, const wxPalette& palette = wxNullPalette ); const wxString& name = wxT("GLCanvas"), int *attribList = 0, const wxPalette& palette = wxNullPalette );
~wxGLCanvas(); ~wxGLCanvas();
@@ -105,24 +105,24 @@ class WXDLLEXPORT wxGLCanvas: public wxWindow
void SwapBuffers(); void SwapBuffers();
void UpdateContext(); void UpdateContext();
void SetViewport(); 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. // Unlike some other platforms, this must get called if you override it.
// It sets the viewport correctly and update the context. // It sets the viewport correctly and update the context.
// You shouldn't call glViewport yourself either (use SetViewport if you must reset it.) // You shouldn't call glViewport yourself either (use SetViewport if you must reset it.)
void OnSize(wxSizeEvent& event); 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; } inline wxGLContext* GetContext() const { return m_glContext; }
protected: protected:
wxGLContext* m_glContext; wxGLContext* m_glContext;
bool m_macCanvasIsShown ; bool m_macCanvasIsShown ;
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };

12
include/wx/mac/carbon/menuitem.h
View File

@@ -1,8 +1,8 @@
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// Name: menuitem.h // Name: wx/mac/carbon/menuitem.h
// Purpose: wxMenuItem class // Purpose: wxMenuItem class
// Author: Vadim Zeitlin // Author: Vadim Zeitlin
// Modified by: // Modified by:
// Created: 11.11.97 // Created: 11.11.97
// RCS-ID: $Id$ // RCS-ID: $Id$
// Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr> // Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
@@ -16,7 +16,7 @@
// headers // headers
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#include "wx/setup.h" #include "wx/defs.h"
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxMenuItem: an item in the menu, optionally implements owner-drawn behaviour // wxMenuItem: an item in the menu, optionally implements owner-drawn behaviour
@@ -36,8 +36,8 @@ public:
// override base class virtuals // override base class virtuals
virtual void SetText(const wxString& strName); virtual void SetText(const wxString& strName);
virtual void Enable(bool bDoEnable = TRUE); virtual void Enable(bool bDoEnable = true);
virtual void Check(bool bDoCheck = TRUE); virtual void Check(bool bDoCheck = true);
virtual void SetBitmap(const wxBitmap& bitmap) ; virtual void SetBitmap(const wxBitmap& bitmap) ;
virtual const wxBitmap& GetBitmap() const { return m_bitmap; } virtual const wxBitmap& GetBitmap() const { return m_bitmap; }
@@ -54,7 +54,7 @@ public:
private: private:
void UncheckRadio() ; void UncheckRadio() ;
// the positions of the first and last items of the radio group this item // 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 // 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 // but first radio group items (m_isRadioGroupStart == FALSE), end is valid

2
include/wx/mac/carbon/msgdlg.h
View File

@@ -13,7 +13,7 @@
#ifndef _WX_MSGBOXDLG_H_ #ifndef _WX_MSGBOXDLG_H_
#define _WX_MSGBOXDLG_H_ #define _WX_MSGBOXDLG_H_
#include "wx/setup.h" #include "wx/defs.h"
#include "wx/dialog.h" #include "wx/dialog.h"
/* /*

4
include/wx/mac/classic/colordlg.h
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: colordlg.h // Name: wx/mac/classic/colordlg.h
// Purpose: wxColourDialog class. Use generic version if no // Purpose: wxColourDialog class. Use generic version if no
// platform-specific implementation. // platform-specific implementation.
// Author: Stefan Csomor // Author: Stefan Csomor
@@ -13,7 +13,7 @@
#ifndef _WX_COLORDLG_H_ #ifndef _WX_COLORDLG_H_
#define _WX_COLORDLG_H_ #define _WX_COLORDLG_H_
#include "wx/setup.h" #include "wx/defs.h"
#include "wx/dialog.h" #include "wx/dialog.h"
#include "wx/cmndata.h" #include "wx/cmndata.h"

32
include/wx/mac/classic/glcanvas.h
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: glcanvas.h // Name: wx/mac/classic/glcanvas.h
// Purpose: wxGLCanvas, for using OpenGL with wxWidgets under Macintosh // Purpose: wxGLCanvas, for using OpenGL with wxWidgets under Macintosh
// Author: Stefan Csomor // Author: Stefan Csomor
// Modified by: // Modified by:
@@ -12,7 +12,7 @@
#ifndef _WX_GLCANVAS_H_ #ifndef _WX_GLCANVAS_H_
#define _WX_GLCANVAS_H_ #define _WX_GLCANVAS_H_
#include "wx/setup.h" #include "wx/defs.h"
#if wxUSE_GLCANVAS #if wxUSE_GLCANVAS
@@ -57,7 +57,7 @@ class WXDLLEXPORT wxGLCanvas; /* forward reference */
class WXDLLEXPORT wxGLContext: public wxObject class WXDLLEXPORT wxGLContext: public wxObject
{ {
public: public:
wxGLContext(AGLPixelFormat fmt, wxGLCanvas *win, wxGLContext(AGLPixelFormat fmt, wxGLCanvas *win,
const wxPalette& WXUNUSED(palette), const wxPalette& WXUNUSED(palette),
const wxGLContext *other /* for sharing display lists */ const wxGLContext *other /* for sharing display lists */
); );
@@ -82,16 +82,16 @@ class WXDLLEXPORT wxGLCanvas: public wxWindow
{ {
DECLARE_CLASS(wxGLCanvas) DECLARE_CLASS(wxGLCanvas)
public: 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 wxSize& size = wxDefaultSize, long style = 0,
const wxString& name = wxT("GLCanvas") , int *attribList = 0, const wxPalette& palette = wxNullPalette); const wxString& name = wxT("GLCanvas") , int *attribList = 0, const wxPalette& palette = wxNullPalette);
wxGLCanvas( wxWindow *parent, const wxGLContext *shared, wxGLCanvas( wxWindow *parent, const wxGLContext *shared,
wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, 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 ); int *attribList = (int*) NULL, const wxPalette& palette = wxNullPalette );
wxGLCanvas( wxWindow *parent, const wxGLCanvas *shared, wxWindowID id = -1, wxGLCanvas( wxWindow *parent, const wxGLCanvas *shared, wxWindowID id = wxID_ANY,
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0,
const wxString& name = wxT("GLCanvas"), int *attribList = 0, const wxPalette& palette = wxNullPalette ); const wxString& name = wxT("GLCanvas"), int *attribList = 0, const wxPalette& palette = wxNullPalette );
~wxGLCanvas(); ~wxGLCanvas();
@@ -105,24 +105,24 @@ class WXDLLEXPORT wxGLCanvas: public wxWindow
void SwapBuffers(); void SwapBuffers();
void UpdateContext(); void UpdateContext();
void SetViewport(); 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. // Unlike some other platforms, this must get called if you override it.
// It sets the viewport correctly and update the context. // It sets the viewport correctly and update the context.
// You shouldn't call glViewport yourself either (use SetViewport if you must reset it.) // You shouldn't call glViewport yourself either (use SetViewport if you must reset it.)
void OnSize(wxSizeEvent& event); 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; } inline wxGLContext* GetContext() const { return m_glContext; }
protected: protected:
wxGLContext* m_glContext; wxGLContext* m_glContext;
bool m_macCanvasIsShown ; bool m_macCanvasIsShown ;
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };

12
include/wx/mac/classic/menuitem.h
View File

@@ -1,8 +1,8 @@
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// Name: menuitem.h // Name: wx/mac/classic/menuitem.h
// Purpose: wxMenuItem class // Purpose: wxMenuItem class
// Author: Vadim Zeitlin // Author: Vadim Zeitlin
// Modified by: // Modified by:
// Created: 11.11.97 // Created: 11.11.97
// RCS-ID: $Id$ // RCS-ID: $Id$
// Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr> // Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
@@ -16,7 +16,7 @@
// headers // headers
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#include "wx/setup.h" #include "wx/defs.h"
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxMenuItem: an item in the menu, optionally implements owner-drawn behaviour // wxMenuItem: an item in the menu, optionally implements owner-drawn behaviour
@@ -36,8 +36,8 @@ public:
// override base class virtuals // override base class virtuals
virtual void SetText(const wxString& strName); virtual void SetText(const wxString& strName);
virtual void Enable(bool bDoEnable = TRUE); virtual void Enable(bool bDoEnable = true);
virtual void Check(bool bDoCheck = TRUE); virtual void Check(bool bDoCheck = true);
virtual void SetBitmap(const wxBitmap& bitmap) ; virtual void SetBitmap(const wxBitmap& bitmap) ;
virtual const wxBitmap& GetBitmap() const { return m_bitmap; } virtual const wxBitmap& GetBitmap() const { return m_bitmap; }
@@ -54,7 +54,7 @@ public:
private: private:
void UncheckRadio() ; void UncheckRadio() ;
// the positions of the first and last items of the radio group this item // 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 // 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 // but first radio group items (m_isRadioGroupStart == FALSE), end is valid

2
include/wx/mac/classic/msgdlg.h
View File

@@ -13,7 +13,7 @@
#ifndef _WX_MSGBOXDLG_H_ #ifndef _WX_MSGBOXDLG_H_
#define _WX_MSGBOXDLG_H_ #define _WX_MSGBOXDLG_H_
#include "wx/setup.h" #include "wx/defs.h"
#include "wx/dialog.h" #include "wx/dialog.h"
/* /*

2
include/wx/motif/msgdlg.h
View File

@@ -13,7 +13,7 @@
#ifndef _WX_MSGBOXDLG_H_ #ifndef _WX_MSGBOXDLG_H_
#define _WX_MSGBOXDLG_H_ #define _WX_MSGBOXDLG_H_
#include "wx/setup.h" #include "wx/defs.h"
#include "wx/dialog.h" #include "wx/dialog.h"
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

2
include/wx/msw/colordlg.h
View File

@@ -12,7 +12,7 @@
#ifndef _WX_COLORDLG_H_ #ifndef _WX_COLORDLG_H_
#define _WX_COLORDLG_H_ #define _WX_COLORDLG_H_
#include "wx/setup.h" #include "wx/defs.h"
#include "wx/dialog.h" #include "wx/dialog.h"
#include "wx/cmndata.h" #include "wx/cmndata.h"

2
include/wx/msw/msgdlg.h
View File

@@ -12,7 +12,7 @@
#ifndef _WX_MSGBOXDLG_H_ #ifndef _WX_MSGBOXDLG_H_
#define _WX_MSGBOXDLG_H_ #define _WX_MSGBOXDLG_H_
#include "wx/setup.h" #include "wx/defs.h"
#include "wx/dialog.h" #include "wx/dialog.h"
/* /*

8
include/wx/os2/menuitem.h
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// Name: menuitem.h // Name: wx/os2/menuitem.h
// Purpose: wxMenuItem class // Purpose: wxMenuItem class
// Author: Vadim Zeitlin // Author: Vadim Zeitlin
// Modified by: // Modified by:
@@ -16,7 +16,7 @@
// headers // headers
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#include "wx/setup.h" #include "wx/defs.h"
// an exception to the general rule that a normal header doesn't include other // 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 // 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 SetText(const wxString& rStrName);
virtual void SetCheckable(bool bCheckable); virtual void SetCheckable(bool bCheckable);
virtual void Enable(bool bDoEnable = TRUE); virtual void Enable(bool bDoEnable = true);
virtual void Check(bool bDoCheck = TRUE); virtual void Check(bool bDoCheck = true);
virtual bool IsChecked(void) const; virtual bool IsChecked(void) const;
// //

2
include/wx/os2/msgdlg.h
View File

@@ -13,7 +13,7 @@
#ifndef _WX_MSGBOXDLG_H_ #ifndef _WX_MSGBOXDLG_H_
#define _WX_MSGBOXDLG_H_ #define _WX_MSGBOXDLG_H_
#include "wx/setup.h" #include "wx/defs.h"
#include "wx/dialog.h" #include "wx/dialog.h"
/* /*

2
include/wx/palmos/colordlg.h
View File

@@ -12,7 +12,7 @@
#ifndef _WX_COLORDLG_H_ #ifndef _WX_COLORDLG_H_
#define _WX_COLORDLG_H_ #define _WX_COLORDLG_H_
#include "wx/setup.h" #include "wx/defs.h"
#include "wx/dialog.h" #include "wx/dialog.h"
#include "wx/cmndata.h" #include "wx/cmndata.h"

2
include/wx/palmos/msgdlg.h
View File

@@ -12,7 +12,7 @@
#ifndef _WX_MSGBOXDLG_H_ #ifndef _WX_MSGBOXDLG_H_
#define _WX_MSGBOXDLG_H_ #define _WX_MSGBOXDLG_H_
#include "wx/setup.h" #include "wx/defs.h"
#include "wx/dialog.h" #include "wx/dialog.h"
/* /*

126
include/wx/x11/glcanvas.h
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: glcanvas.h // Name: wx/x11/glcanvas.h
// Purpose: wxGLCanvas, for using OpenGL with wxWidgets 2.0 for Motif. // Purpose: wxGLCanvas, for using OpenGL with wxWidgets 2.0 for Motif.
// Uses the GLX extension. // Uses the GLX extension.
// Author: Julian Smart and Wolfram Gloger // Author: Julian Smart and Wolfram Gloger
@@ -7,13 +7,13 @@
// Created: 1995, 1999 // Created: 1995, 1999
// RCS-ID: $Id$ // RCS-ID: $Id$
// Copyright: (c) Julian Smart, Wolfram Gloger // Copyright: (c) Julian Smart, Wolfram Gloger
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifndef _WX_GLCANVAS_H_ #ifndef _WX_GLCANVAS_H_
#define _WX_GLCANVAS_H_ #define _WX_GLCANVAS_H_
#include "wx/setup.h" #include "wx/defs.h"
#if wxUSE_GLCANVAS #if wxUSE_GLCANVAS
@@ -26,21 +26,21 @@
enum enum
{ {
WX_GL_RGBA=1, /* use true color palette */ WX_GL_RGBA=1, /* use true color palette */
WX_GL_BUFFER_SIZE, /* bits for buffer if not WX_GL_RGBA */ 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_LEVEL, /* 0 for main buffer, >0 for overlay, <0 for underlay */
WX_GL_DOUBLEBUFFER, /* use doublebuffer */ WX_GL_DOUBLEBUFFER, /* use doublebuffer */
WX_GL_STEREO, /* use stereoscopic display */ WX_GL_STEREO, /* use stereoscopic display */
WX_GL_AUX_BUFFERS, /* number of auxiliary buffers */ WX_GL_AUX_BUFFERS, /* number of auxiliary buffers */
WX_GL_MIN_RED, /* use red buffer with most bits (> MIN_RED bits) */ 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_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_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_MIN_ALPHA, /* use blue buffer with most bits (> MIN_ALPHA bits) */
WX_GL_DEPTH_SIZE, /* bits for Z-buffer (0,16,32) */ WX_GL_DEPTH_SIZE, /* bits for Z-buffer (0,16,32) */
WX_GL_STENCIL_SIZE, /* bits for stencil buffer */ 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_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_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_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_MIN_ACCUM_ALPHA /* use blue buffer with most bits (> MIN_ACCUM_ALPHA bits) */
}; };
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
@@ -51,34 +51,34 @@ enum
class WXDLLEXPORT wxGLContext: public wxObject class WXDLLEXPORT wxGLContext: public wxObject
{ {
public: public:
wxGLContext( bool isRGB, wxWindow *win, wxGLContext( bool isRGB, wxWindow *win,
const wxPalette& palette = wxNullPalette ); const wxPalette& palette = wxNullPalette );
wxGLContext( bool WXUNUSED(isRGB), wxWindow *win, wxGLContext( bool WXUNUSED(isRGB), wxWindow *win,
const wxPalette& WXUNUSED(palette), const wxPalette& WXUNUSED(palette),
const wxGLContext *other /* for sharing display lists */ const wxGLContext *other /* for sharing display lists */
); );
~wxGLContext(); ~wxGLContext();
void SetCurrent(); void SetCurrent();
void SetColour(const wxChar *colour); void SetColour(const wxChar *colour);
void SwapBuffers(); void SwapBuffers();
void SetupPixelFormat(); void SetupPixelFormat();
void SetupPalette(const wxPalette& palette); void SetupPalette(const wxPalette& palette);
wxPalette CreateDefaultPalette(); wxPalette CreateDefaultPalette();
inline wxPalette* GetPalette() const { return (wxPalette*) & m_palette; } inline wxPalette* GetPalette() const { return (wxPalette*) & m_palette; }
inline wxWindow* GetWindow() const { return m_window; } inline wxWindow* GetWindow() const { return m_window; }
// inline GtkWidget* GetWidget() const { return m_widget; } // inline GtkWidget* GetWidget() const { return m_widget; }
inline GLXContext GetContext() const { return m_glContext; } inline GLXContext GetContext() const { return m_glContext; }
public: public:
GLXContext m_glContext; GLXContext m_glContext;
// GtkWidget *m_widget; // GtkWidget *m_widget;
wxPalette m_palette; wxPalette m_palette;
wxWindow* m_window; wxWindow* m_window;
DECLARE_CLASS(wxGLContext) DECLARE_CLASS(wxGLContext)
}; };
@@ -93,61 +93,61 @@ public:
m_vi = (void*) NULL; m_vi = (void*) NULL;
// m_exposed = FALSE; // m_exposed = FALSE;
} }
wxGLCanvas( wxWindow *parent, wxWindowID id = -1, wxGLCanvas( wxWindow *parent, wxWindowID id = wxID_ANY,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, const wxString& name = wxT("GLCanvas"), 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,
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, const wxString& name = wxT("GLCanvas"),
int *attribList = (int*) NULL,
const wxPalette& palette = wxNullPalette );
bool Create( wxWindow *parent,
const wxGLContext *shared = (wxGLContext*)NULL,
const wxGLCanvas *shared_context_of = (wxGLCanvas*)NULL,
wxWindowID id = -1,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = 0, const wxString& name = wxT("GLCanvas"),
int *attribList = (int*) NULL, int *attribList = (int*) NULL,
const wxPalette& palette = wxNullPalette ); const wxPalette& palette = wxNullPalette );
wxGLCanvas( wxWindow *parent, const wxGLContext *shared,
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 = 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 );
bool Create( wxWindow *parent,
const wxGLContext *shared = (wxGLContext*)NULL,
const wxGLCanvas *shared_context_of = (wxGLCanvas*)NULL,
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(); ~wxGLCanvas();
void SetCurrent(); void SetCurrent();
void SetColour(const wxChar *colour); void SetColour(const wxChar *colour);
void SwapBuffers(); void SwapBuffers();
// void OnSize(wxSizeEvent& event); // void OnSize(wxSizeEvent& event);
// void OnInternalIdle(); // void OnInternalIdle();
inline wxGLContext* GetContext() const { return m_glContext; } inline wxGLContext* GetContext() const { return m_glContext; }
// implementation // implementation
wxGLContext *m_glContext, wxGLContext *m_glContext,
*m_sharedContext; *m_sharedContext;
wxGLCanvas *m_sharedContextOf; wxGLCanvas *m_sharedContextOf;
void *m_vi; void *m_vi;
// GtkWidget *m_glWidget; // GtkWidget *m_glWidget;
// bool m_exposed; // bool m_exposed;
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
DECLARE_CLASS(wxGLCanvas) DECLARE_CLASS(wxGLCanvas)
}; };
#endif #endif