#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"
#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"
WXDLLEXPORT int wxFontStyleStringToInt(wxChar *style);
#endif // _WX_GENERIC_FONTDLGG_H
-
#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
#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"
// copy data between the dialog and m_colourData:
void ColourDataToDialog();
void DialogToColourData();
-
+
wxColourData m_data;
DECLARE_DYNAMIC_CLASS(wxColourDialog)
#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
#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"
/////////////////////////////////////////////////////////////////////////////
-// Name: wx/gtk/msgdlg.h
+// Name: wx/gtk1/msgdlg.h
// Purpose: wxMessageDialog for GTK+2
// Author: Vaclav Slavik
// Modified by:
#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
/////////////////////////////////////////////////////////////////////////////
-// Name: colordlg.h
+// Name: wx/mac/carbon/colordlg.h
// Purpose: wxColourDialog class. Use generic version if no
// platform-specific implementation.
// Author: Stefan Csomor
#ifndef _WX_COLORDLG_H_
#define _WX_COLORDLG_H_
-#include "wx/setup.h"
+#include "wx/defs.h"
#include "wx/dialog.h"
#include "wx/cmndata.h"
/////////////////////////////////////////////////////////////////////////////
-// Name: glcanvas.h
+// Name: wx/mac/carbon/glcanvas.h
// Purpose: wxGLCanvas, for using OpenGL with wxWidgets under Macintosh
// Author: Stefan Csomor
// Modified by:
#ifndef _WX_GLCANVAS_H_
#define _WX_GLCANVAS_H_
-#include "wx/setup.h"
+#include "wx/defs.h"
#if wxUSE_GLCANVAS
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 */
);
{
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();
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()
};
///////////////////////////////////////////////////////////////////////////////
-// 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 <zeitlin@dptmaths.ens-cachan.fr>
// headers
// ----------------------------------------------------------------------------
-#include "wx/setup.h"
+#include "wx/defs.h"
// ----------------------------------------------------------------------------
// wxMenuItem: an item in the menu, optionally implements owner-drawn behaviour
// 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; }
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
#ifndef _WX_MSGBOXDLG_H_
#define _WX_MSGBOXDLG_H_
-#include "wx/setup.h"
+#include "wx/defs.h"
#include "wx/dialog.h"
/*
/////////////////////////////////////////////////////////////////////////////
-// Name: colordlg.h
+// Name: wx/mac/classic/colordlg.h
// Purpose: wxColourDialog class. Use generic version if no
// platform-specific implementation.
// Author: Stefan Csomor
#ifndef _WX_COLORDLG_H_
#define _WX_COLORDLG_H_
-#include "wx/setup.h"
+#include "wx/defs.h"
#include "wx/dialog.h"
#include "wx/cmndata.h"
/////////////////////////////////////////////////////////////////////////////
-// Name: glcanvas.h
+// Name: wx/mac/classic/glcanvas.h
// Purpose: wxGLCanvas, for using OpenGL with wxWidgets under Macintosh
// Author: Stefan Csomor
// Modified by:
#ifndef _WX_GLCANVAS_H_
#define _WX_GLCANVAS_H_
-#include "wx/setup.h"
+#include "wx/defs.h"
#if wxUSE_GLCANVAS
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 */
);
{
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();
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()
};
///////////////////////////////////////////////////////////////////////////////
-// 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 <zeitlin@dptmaths.ens-cachan.fr>
// headers
// ----------------------------------------------------------------------------
-#include "wx/setup.h"
+#include "wx/defs.h"
// ----------------------------------------------------------------------------
// wxMenuItem: an item in the menu, optionally implements owner-drawn behaviour
// 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; }
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
#ifndef _WX_MSGBOXDLG_H_
#define _WX_MSGBOXDLG_H_
-#include "wx/setup.h"
+#include "wx/defs.h"
#include "wx/dialog.h"
/*
#ifndef _WX_MSGBOXDLG_H_
#define _WX_MSGBOXDLG_H_
-#include "wx/setup.h"
+#include "wx/defs.h"
#include "wx/dialog.h"
// ----------------------------------------------------------------------------
#ifndef _WX_COLORDLG_H_
#define _WX_COLORDLG_H_
-#include "wx/setup.h"
+#include "wx/defs.h"
#include "wx/dialog.h"
#include "wx/cmndata.h"
#ifndef _WX_MSGBOXDLG_H_
#define _WX_MSGBOXDLG_H_
-#include "wx/setup.h"
+#include "wx/defs.h"
#include "wx/dialog.h"
/*
///////////////////////////////////////////////////////////////////////////////
-// Name: menuitem.h
+// Name: wx/os2/menuitem.h
// Purpose: wxMenuItem class
// Author: Vadim Zeitlin
// Modified by:
// 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
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;
//
#ifndef _WX_MSGBOXDLG_H_
#define _WX_MSGBOXDLG_H_
-#include "wx/setup.h"
+#include "wx/defs.h"
#include "wx/dialog.h"
/*
#ifndef _WX_COLORDLG_H_
#define _WX_COLORDLG_H_
-#include "wx/setup.h"
+#include "wx/defs.h"
#include "wx/dialog.h"
#include "wx/cmndata.h"
#ifndef _WX_MSGBOXDLG_H_
#define _WX_MSGBOXDLG_H_
-#include "wx/setup.h"
+#include "wx/defs.h"
#include "wx/dialog.h"
/*
/////////////////////////////////////////////////////////////////////////////
-// 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
// 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
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) */
};
//---------------------------------------------------------------------------
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)
};
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
projects / wxWidgets.git / commitdiff
