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

General tidy-up (mainly typecasts) to allow the use of the SGI native

Browse Source 
compilers (tested on Irix 6.5 with -mips3 -n32).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@623 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Unknown (RO)
1998-08-23 03:22:56 +00:00
parent cb6780ff01
commit c67daf8777
215 changed files with 1654 additions and 1458 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/confbase.h
View File

@@ -139,11 +139,11 @@ public:
// (and if the key is not found the default value is returned.) // (and if the key is not found the default value is returned.)
// read a string from the key // read a string from the key
virtual bool Read(wxString *pStr, const char *szKey, virtual bool Read(wxString *pStr, const char *szKey,
const char *szDefault = NULL) const = 0; const char *szDefault = (const char *) NULL) const = 0;
// another version using statis buffer - it means it will be overwritten // another version using statis buffer - it means it will be overwritten
// after each call to this function! // after each call to this function!
virtual const char *Read(const char *szKey, virtual const char *Read(const char *szKey,
const char *szDefault = NULL) const; const char *szDefault = (const char *) NULL) const;
// the same for longs // the same for longs
virtual long Read(const char *szKey, long lDefault) const virtual long Read(const char *szKey, long lDefault) const
{ long l; Read(&l, szKey, lDefault); return l; } { long l; Read(&l, szKey, lDefault); return l; }

2
include/wx/debug.h
View File

@@ -51,7 +51,7 @@
@param szFile and nLine - file name and line number of the ASSERT @param szFile and nLine - file name and line number of the ASSERT
szMsg - optional message explaining the reason szMsg - optional message explaining the reason
*/ */
void wxOnAssert(const char *szFile, int nLine, const char *szMsg = NULL); void wxOnAssert(const char *szFile, int nLine, const char *szMsg = (const char *) NULL);
/// generic assert macro /// generic assert macro
#define wxASSERT(cond) if ( !(cond) ) wxOnAssert(__FILE__, __LINE__) #define wxASSERT(cond) if ( !(cond) ) wxOnAssert(__FILE__, __LINE__)

29
include/wx/defs.h
View File

@@ -30,8 +30,14 @@
#include "wx/version.h" #include "wx/version.h"
// Helps SGI compilation, apparently // Helps SGI compilation, apparently
#if defined(__SGI__) && defined(__GNUG__) #if defined(__SGI__)
#if defined(__GNUG__)
#define __need_wchar_t #define __need_wchar_t
#else
/* Note I use the term __SGI_CC__ for both cc and CC, its not a good idea to
* mix gcc and cc/CC, the name mangling is different */
#define __SGI_CC__
#endif
#endif #endif
// Eliminate double/float warnings // Eliminate double/float warnings
@@ -199,10 +205,27 @@ enum ErrCode
// a question of style, because delete will do it itself anyhow, but it might // a question of style, because delete will do it itself anyhow, but it might
// be considered as an error by some overzealous debugging implementations of // be considered as an error by some overzealous debugging implementations of
// the library, so we do it ourselves) // the library, so we do it ourselves)
#if defined(__SGI_CC__)
// Okay this is bad styling, but the native SGI compiler is very picky, it
// wont let you compare/assign between a NULL (void *) and another pointer
// type. To be really clean we'd need to pass in another argument, the type
// of p.
// Also note the use of 0L, this would allow future possible 64bit support
// (as yet untested) by ensuring that we zero all the bits in a pointer
// (which is always the same length as a long (at least with the LP64 standard)
// --- offer aug 98
#define wxDELETE(p) if ( (p) ) { delete (p); (p) = 0L; }
#else
#define wxDELETE(p) if ( (p) != NULL ) { delete (p); p = NULL; } #define wxDELETE(p) if ( (p) != NULL ) { delete (p); p = NULL; }
#endif /* __SGI__CC__ */
// delete an array and NULL it (see comments above) // delete an array and NULL it (see comments above)
#define wxDELETEA(p) if ( (p) != NULL ) { delete [] (p); p = NULL; } #if defined(__SGI_CC__)
// see above comment.
#define wxDELETEA(p) if ( (p) ) { delete [] (p); p = 0L; }
#else
#define wxDELETEA(p) if ( ((void *)) (p) != NULL ) { delete [] (p); (void *) p = NULL; }
#endif /* __SGI__CC__ */
/// size of statically declared array /// size of statically declared array
#define WXSIZEOF(array) (sizeof(array)/sizeof(array[0])) #define WXSIZEOF(array) (sizeof(array)/sizeof(array[0]))
@@ -212,7 +235,7 @@ enum ErrCode
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// OS // OS
#if defined(__HPUX__) || defined(____SVR4____) || defined(__LINUX__) #if defined(__HPUX__) || defined(____SVR4____) || defined(__LINUX__) || defined(__sgi )
#ifndef __UNIX__ #ifndef __UNIX__
#define __UNIX__ #define __UNIX__
#endif #endif

12
include/wx/docview.h
View File

@@ -56,7 +56,7 @@ class WXDLLEXPORT wxDocument : public wxEvtHandler
{ {
DECLARE_ABSTRACT_CLASS(wxDocument) DECLARE_ABSTRACT_CLASS(wxDocument)
public: public:
wxDocument(wxDocument *parent = NULL); wxDocument(wxDocument *parent = (wxDocument *) NULL);
~wxDocument(void); ~wxDocument(void);
void SetFilename(const wxString& filename, bool notifyViews = FALSE); void SetFilename(const wxString& filename, bool notifyViews = FALSE);
@@ -114,7 +114,7 @@ class WXDLLEXPORT wxDocument : public wxEvtHandler
inline wxList& GetViews(void) const { return (wxList&) m_documentViews; } inline wxList& GetViews(void) const { return (wxList&) m_documentViews; }
wxView *GetFirstView(void) const; wxView *GetFirstView(void) const;
virtual void UpdateAllViews(wxView *sender = NULL, wxObject *hint = NULL); virtual void UpdateAllViews(wxView *sender = (wxView *) NULL, wxObject *hint = (wxObject *) NULL);
// Remove all views (because we're closing the document) // Remove all views (because we're closing the document)
virtual bool DeleteAllViews(void); virtual bool DeleteAllViews(void);
@@ -146,7 +146,7 @@ class WXDLLEXPORT wxView: public wxEvtHandler
{ {
DECLARE_ABSTRACT_CLASS(wxView) DECLARE_ABSTRACT_CLASS(wxView)
public: public:
wxView(wxDocument *doc = NULL); wxView(wxDocument *doc = (wxDocument *) NULL);
~wxView(void); ~wxView(void);
inline wxDocument *GetDocument(void) const { return m_viewDocument; } inline wxDocument *GetDocument(void) const { return m_viewDocument; }
@@ -161,7 +161,7 @@ class WXDLLEXPORT wxView: public wxEvtHandler
virtual void OnActivateView(bool activate, wxView *activeView, wxView *deactiveView); virtual void OnActivateView(bool activate, wxView *activeView, wxView *deactiveView);
virtual void OnDraw(wxDC *dc) = 0; virtual void OnDraw(wxDC *dc) = 0;
virtual void OnPrint(wxDC *dc, wxObject *info); virtual void OnPrint(wxDC *dc, wxObject *info);
virtual void OnUpdate(wxView *sender, wxObject *hint = NULL); virtual void OnUpdate(wxView *sender, wxObject *hint = (wxObject *) NULL);
virtual void OnChangeFilename(void); virtual void OnChangeFilename(void);
// Called by framework if created automatically by the // Called by framework if created automatically by the
@@ -212,7 +212,7 @@ class WXDLLEXPORT wxDocTemplate: public wxObject
// template/document type // template/document type
wxDocTemplate(wxDocManager *manager, const wxString& descr, const wxString& filter, const wxString& dir, wxDocTemplate(wxDocManager *manager, const wxString& descr, const wxString& filter, const wxString& dir,
const wxString& ext, const wxString& docTypeName, const wxString& viewTypeName, const wxString& ext, const wxString& docTypeName, const wxString& viewTypeName,
wxClassInfo *docClassInfo = NULL, wxClassInfo *viewClassInfo = NULL, wxClassInfo *docClassInfo = (wxClassInfo *) NULL, wxClassInfo *viewClassInfo = (wxClassInfo *)NULL,
long flags = wxDEFAULT_TEMPLATE_FLAGS); long flags = wxDEFAULT_TEMPLATE_FLAGS);
~wxDocTemplate(void); ~wxDocTemplate(void);
@@ -416,7 +416,7 @@ class WXDLLEXPORT wxDocPrintout: public wxPrintout
{ {
DECLARE_DYNAMIC_CLASS(wxDocPrintout) DECLARE_DYNAMIC_CLASS(wxDocPrintout)
public: public:
wxDocPrintout(wxView *view = NULL, const wxString& title = "Printout"); wxDocPrintout(wxView *view = (wxView *) NULL, const wxString& title = "Printout");
bool OnPrintPage(int page); bool OnPrintPage(int page);
bool HasPage(int page); bool HasPage(int page);
bool OnBeginDocument(int startPage, int endPage); bool OnBeginDocument(int startPage, int endPage);

242
include/wx/event.h
View File

@@ -597,7 +597,7 @@ class WXDLLEXPORT wxEraseEvent: public wxEvent
DECLARE_DYNAMIC_CLASS(wxEraseEvent) DECLARE_DYNAMIC_CLASS(wxEraseEvent)
public: public:
wxDC *m_dc ; wxDC *m_dc ;
inline wxEraseEvent(int Id = 0, wxDC *dc = NULL) { m_eventType = wxEVT_ERASE_BACKGROUND; m_id = Id; m_dc = dc; } inline wxEraseEvent(int Id = 0, wxDC *dc = (wxDC *) NULL) { m_eventType = wxEVT_ERASE_BACKGROUND; m_id = Id; m_dc = dc; }
inline wxDC *GetDC() const { return m_dc; } inline wxDC *GetDC() const { return m_dc; }
}; };
@@ -827,7 +827,7 @@ class WXDLLEXPORT wxDropFilesEvent: public wxEvent
wxPoint m_pos; wxPoint m_pos;
wxString* m_files; // Memory (de)allocated by code calling ProcessEvent wxString* m_files; // Memory (de)allocated by code calling ProcessEvent
inline wxDropFilesEvent(wxEventType type = wxEVT_NULL, int noFiles = 0, wxString *files = NULL) inline wxDropFilesEvent(wxEventType type = wxEVT_NULL, int noFiles = 0, wxString *files = (wxString *) NULL)
{ m_eventType = type; m_noFiles = noFiles; m_files = files; } { m_eventType = type; m_noFiles = noFiles; m_files = files; }
inline wxPoint GetPosition(void) const { return m_pos; } inline wxPoint GetPosition(void) const { return m_pos; }
@@ -918,7 +918,7 @@ class WXDLLEXPORT wxPaletteChangedEvent: public wxEvent
public: public:
inline wxPaletteChangedEvent(wxWindowID id = 0): wxEvent(id) inline wxPaletteChangedEvent(wxWindowID id = 0): wxEvent(id)
{ m_eventType = wxEVT_PALETTE_CHANGED; m_changedWindow = NULL; } { m_eventType = wxEVT_PALETTE_CHANGED; m_changedWindow = (wxWindow *) NULL; }
inline void SetChangedWindow(wxWindow* win) { m_changedWindow = win; } inline void SetChangedWindow(wxWindow* win) { m_changedWindow = win; }
inline wxWindow* GetChangedWindow() const { return m_changedWindow; } inline wxWindow* GetChangedWindow() const { return m_changedWindow; }
@@ -1044,7 +1044,7 @@ class WXDLLEXPORT wxEvtHandler: public wxObject
void Connect( int id, int lastId, void Connect( int id, int lastId,
int eventType, int eventType,
wxObjectEventFunction func, wxObjectEventFunction func,
wxObject *userData = NULL ); wxObject *userData = (wxObject *) NULL );
bool SearchDynamicEventTable( wxEvent& event ); bool SearchDynamicEventTable( wxEvent& event );
@@ -1112,161 +1112,161 @@ const wxEventTableEntry theClass::sm_eventTableEntries[] = { \
*/ */
// Generic events // Generic events
#define EVT_CUSTOM(event, id, func) { event, id, -1, (wxObjectEventFunction) (wxEventFunction) & func, NULL }, #define EVT_CUSTOM(event, id, func) { event, id, -1, (wxObjectEventFunction) (wxEventFunction) & func, (wxObject *) NULL },
#define EVT_CUSTOM_RANGE(event, id1, id2, func) { event, id1, id2, (wxObjectEventFunction) (wxEventFunction) & func, NULL }, #define EVT_CUSTOM_RANGE(event, id1, id2, func) { event, id1, id2, (wxObjectEventFunction) (wxEventFunction) & func, (wxObject *) NULL },
// Miscellaneous // Miscellaneous
#define EVT_SIZE(func) { wxEVT_SIZE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxSizeEventFunction) & func, NULL }, #define EVT_SIZE(func) { wxEVT_SIZE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxSizeEventFunction) & func, (wxObject *) NULL },
#define EVT_MOVE(func) { wxEVT_MOVE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMoveEventFunction) & func, NULL }, #define EVT_MOVE(func) { wxEVT_MOVE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMoveEventFunction) & func, (wxObject *) NULL },
#define EVT_CLOSE(func) { wxEVT_CLOSE_WINDOW, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxCloseEventFunction) & func, NULL }, #define EVT_CLOSE(func) { wxEVT_CLOSE_WINDOW, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxCloseEventFunction) & func, (wxObject *) NULL },
#define EVT_PAINT(func) { wxEVT_PAINT, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxPaintEventFunction) & func, NULL }, #define EVT_PAINT(func) { wxEVT_PAINT, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxPaintEventFunction) & func, (wxObject *) NULL },
#define EVT_ERASE_BACKGROUND(func) { wxEVT_ERASE_BACKGROUND, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxEraseEventFunction) & func, NULL }, #define EVT_ERASE_BACKGROUND(func) { wxEVT_ERASE_BACKGROUND, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxEraseEventFunction) & func, (wxObject *) NULL },
#define EVT_CHAR(func) { wxEVT_CHAR, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxCharEventFunction) & func, NULL }, #define EVT_CHAR(func) { wxEVT_CHAR, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxCharEventFunction) & func, (wxObject *) NULL },
#define EVT_CHAR_HOOK(func) { wxEVT_CHAR_HOOK, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxCharEventFunction) & func, NULL }, #define EVT_CHAR_HOOK(func) { wxEVT_CHAR_HOOK, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxCharEventFunction) & func, NULL },
#define EVT_MENU_HIGHLIGHT(id, func) { wxEVT_MENU_HIGHLIGHT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxMenuEventFunction) & func, NULL }, #define EVT_MENU_HIGHLIGHT(id, func) { wxEVT_MENU_HIGHLIGHT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxMenuEventFunction) & func, (wxObject *) NULL },
#define EVT_MENU_HIGHLIGHT_ALL(func) { wxEVT_MENU_HIGHLIGHT, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMenuEventFunction) & func, NULL }, #define EVT_MENU_HIGHLIGHT_ALL(func) { wxEVT_MENU_HIGHLIGHT, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMenuEventFunction) & func, (wxObject *) NULL },
#define EVT_SET_FOCUS(func) { wxEVT_SET_FOCUS, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxFocusEventFunction) & func, NULL }, #define EVT_SET_FOCUS(func) { wxEVT_SET_FOCUS, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxFocusEventFunction) & func, (wxObject *) NULL },
#define EVT_KILL_FOCUS(func) { wxEVT_KILL_FOCUS, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxFocusEventFunction) & func, NULL }, #define EVT_KILL_FOCUS(func) { wxEVT_KILL_FOCUS, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxFocusEventFunction) & func, (wxObject *) NULL },
#define EVT_ACTIVATE(func) { wxEVT_ACTIVATE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxActivateEventFunction) & func, NULL }, #define EVT_ACTIVATE(func) { wxEVT_ACTIVATE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxActivateEventFunction) & func, (wxObject *) NULL },
#define EVT_ACTIVATE_APP(func) { wxEVT_ACTIVATE_APP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxActivateEventFunction) & func, NULL }, #define EVT_ACTIVATE_APP(func) { wxEVT_ACTIVATE_APP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxActivateEventFunction) & func, (wxObject *) NULL },
#define EVT_END_SESSION(func) { wxEVT_END_SESSION, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxCloseEventFunction) & func, NULL }, #define EVT_END_SESSION(func) { wxEVT_END_SESSION, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxCloseEventFunction) & func, (wxObject *) NULL },
#define EVT_QUERY_END_SESSION(func) { wxEVT_QUERY_END_SESSION, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxCloseEventFunction) & func, NULL }, #define EVT_QUERY_END_SESSION(func) { wxEVT_QUERY_END_SESSION, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxCloseEventFunction) & func, (wxObject *) NULL },
#define EVT_DROP_FILES(func) { wxEVT_DROP_FILES, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxDropFilesEventFunction) & func, NULL }, #define EVT_DROP_FILES(func) { wxEVT_DROP_FILES, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxDropFilesEventFunction) & func, (wxObject *) NULL },
#define EVT_INIT_DIALOG(func) { wxEVT_INIT_DIALOG, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxInitDialogEventFunction) & func, NULL }, #define EVT_INIT_DIALOG(func) { wxEVT_INIT_DIALOG, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxInitDialogEventFunction) & func, (wxObject *) NULL },
#define EVT_SYS_COLOUR_CHANGED(func) { wxEVT_SYS_COLOUR_CHANGED, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxSysColourChangedFunction) & func, NULL }, #define EVT_SYS_COLOUR_CHANGED(func) { wxEVT_SYS_COLOUR_CHANGED, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxSysColourChangedFunction) & func, (wxObject *) NULL },
#define EVT_SHOW(func) { wxEVT_SHOW, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxShowEventFunction) & func, NULL }, #define EVT_SHOW(func) { wxEVT_SHOW, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxShowEventFunction) & func, (wxObject *) NULL },
#define EVT_MAXIMIZE(func) { wxEVT_MAXIMIZE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMaximizeEventFunction) & func, NULL }, #define EVT_MAXIMIZE(func) { wxEVT_MAXIMIZE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMaximizeEventFunction) & func, (wxObject *) NULL },
#define EVT_ICONIZE(func) { wxEVT_ICONIZE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxIconizeEventFunction) & func, NULL }, #define EVT_ICONIZE(func) { wxEVT_ICONIZE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxIconizeEventFunction) & func, (wxObject *) NULL },
#define EVT_NAVIGATION_KEY(func) { wxEVT_NAVIGATION_KEY, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNavigationKeyEventFunction) & func, NULL }, #define EVT_NAVIGATION_KEY(func) { wxEVT_NAVIGATION_KEY, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNavigationKeyEventFunction) & func, (wxObject *) NULL },
#define EVT_PALETTE_CHANGED(func) { wxEVT_PALETTE_CHANGED, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxPaletteChangedEventFunction) & func, NULL }, #define EVT_PALETTE_CHANGED(func) { wxEVT_PALETTE_CHANGED, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxPaletteChangedEventFunction) & func, (wxObject *) NULL },
#define EVT_QUERY_NEW_PALETTE(func) { wxEVT_QUERY_NEW_PALETTE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxQueryNewPaletteEventFunction) & func, NULL }, #define EVT_QUERY_NEW_PALETTE(func) { wxEVT_QUERY_NEW_PALETTE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxQueryNewPaletteEventFunction) & func, (wxObject *) NULL },
// Mouse events // Mouse events
#define EVT_LEFT_DOWN(func) { wxEVT_LEFT_DOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, NULL }, #define EVT_LEFT_DOWN(func) { wxEVT_LEFT_DOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL },
#define EVT_LEFT_UP(func) { wxEVT_LEFT_UP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, NULL }, #define EVT_LEFT_UP(func) { wxEVT_LEFT_UP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL },
#define EVT_MIDDLE_DOWN(func) { wxEVT_MIDDLE_DOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, NULL }, #define EVT_MIDDLE_DOWN(func) { wxEVT_MIDDLE_DOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL },
#define EVT_MIDDLE_UP(func) { wxEVT_MIDDLE_UP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, NULL }, #define EVT_MIDDLE_UP(func) { wxEVT_MIDDLE_UP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL },
#define EVT_RIGHT_DOWN(func) { wxEVT_RIGHT_DOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, NULL }, #define EVT_RIGHT_DOWN(func) { wxEVT_RIGHT_DOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL },
#define EVT_RIGHT_UP(func) { wxEVT_RIGHT_UP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, NULL }, #define EVT_RIGHT_UP(func) { wxEVT_RIGHT_UP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL },
#define EVT_MOTION(func) { wxEVT_MOTION, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, NULL }, #define EVT_MOTION(func) { wxEVT_MOTION, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL },
#define EVT_LEFT_DCLICK(func) { wxEVT_LEFT_DCLICK, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, NULL }, #define EVT_LEFT_DCLICK(func) { wxEVT_LEFT_DCLICK, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL },
#define EVT_MIDDLE_DCLICK(func) { wxEVT_MIDDLE_DCLICK, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, NULL }, #define EVT_MIDDLE_DCLICK(func) { wxEVT_MIDDLE_DCLICK, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL },
#define EVT_RIGHT_DCLICK(func) { wxEVT_RIGHT_DCLICK, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, NULL }, #define EVT_RIGHT_DCLICK(func) { wxEVT_RIGHT_DCLICK, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL },
#define EVT_LEAVE_WINDOW(func) { wxEVT_LEAVE_WINDOW, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, NULL }, #define EVT_LEAVE_WINDOW(func) { wxEVT_LEAVE_WINDOW, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL },
#define EVT_ENTER_WINDOW(func) { wxEVT_ENTER_WINDOW, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, NULL }, #define EVT_ENTER_WINDOW(func) { wxEVT_ENTER_WINDOW, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL },
// All mouse events // All mouse events
#define EVT_MOUSE_EVENTS(func) \ #define EVT_MOUSE_EVENTS(func) \
{ wxEVT_LEFT_DOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, NULL },\ { wxEVT_LEFT_DOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL },\
{ wxEVT_LEFT_UP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, NULL },\ { wxEVT_LEFT_UP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL },\
{ wxEVT_MIDDLE_DOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, NULL },\ { wxEVT_MIDDLE_DOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL },\
{ wxEVT_MIDDLE_UP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, NULL },\ { wxEVT_MIDDLE_UP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL },\
{ wxEVT_RIGHT_DOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, NULL },\ { wxEVT_RIGHT_DOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL },\
{ wxEVT_RIGHT_UP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, NULL },\ { wxEVT_RIGHT_UP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL },\
{ wxEVT_MOTION, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, NULL },\ { wxEVT_MOTION, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL },\
{ wxEVT_LEFT_DCLICK, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, NULL },\ { wxEVT_LEFT_DCLICK, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL },\
{ wxEVT_MIDDLE_DCLICK, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, NULL },\ { wxEVT_MIDDLE_DCLICK, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL },\
{ wxEVT_RIGHT_DCLICK, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, NULL },\ { wxEVT_RIGHT_DCLICK, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL },\
{ wxEVT_ENTER_WINDOW, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, NULL },\ { wxEVT_ENTER_WINDOW, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL },\
{ wxEVT_LEAVE_WINDOW, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, NULL }, { wxEVT_LEAVE_WINDOW, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL },
// EVT_COMMAND // EVT_COMMAND
#define EVT_COMMAND(id, cmd, fn) { cmd, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, NULL }, #define EVT_COMMAND(id, cmd, fn) { cmd, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
#define EVT_COMMAND_RANGE(id1, id2, cmd, fn) { cmd, id1, id2, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, NULL }, #define EVT_COMMAND_RANGE(id1, id2, cmd, fn) { cmd, id1, id2, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, N(wxObject *) ULL },
// Scrolling // Scrolling
#define EVT_SCROLL(func) \ #define EVT_SCROLL(func) \
{ wxEVT_SCROLL_TOP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, NULL },\ { wxEVT_SCROLL_TOP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL },\
{ wxEVT_SCROLL_BOTTOM, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, NULL },\ { wxEVT_SCROLL_BOTTOM, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL },\
{ wxEVT_SCROLL_LINEUP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, NULL },\ { wxEVT_SCROLL_LINEUP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL },\
{ wxEVT_SCROLL_LINEDOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, NULL },\ { wxEVT_SCROLL_LINEDOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL },\
{ wxEVT_SCROLL_PAGEUP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, NULL },\ { wxEVT_SCROLL_PAGEUP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL },\
{ wxEVT_SCROLL_PAGEDOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, NULL },\ { wxEVT_SCROLL_PAGEDOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL },\
{ wxEVT_SCROLL_THUMBTRACK, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, NULL }, { wxEVT_SCROLL_THUMBTRACK, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL },
#define EVT_SCROLL_TOP(func) { wxEVT_SCROLL_TOP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, NULL }, #define EVT_SCROLL_TOP(func) { wxEVT_SCROLL_TOP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL },
#define EVT_SCROLL_BOTTOM(func) { wxEVT_SCROLL_BOTTOM, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, NULL }, #define EVT_SCROLL_BOTTOM(func) { wxEVT_SCROLL_BOTTOM, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL },
#define EVT_SCROLL_LINEUP(func) { wxEVT_SCROLL_LINEUP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, NULL }, #define EVT_SCROLL_LINEUP(func) { wxEVT_SCROLL_LINEUP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL },
#define EVT_SCROLL_LINEDOWN(func) { wxEVT_SCROLL_LINEDOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, NULL }, #define EVT_SCROLL_LINEDOWN(func) { wxEVT_SCROLL_LINEDOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL },
#define EVT_SCROLL_PAGEUP(func) { wxEVT_SCROLL_PAGEUP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, NULL }, #define EVT_SCROLL_PAGEUP(func) { wxEVT_SCROLL_PAGEUP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL },
#define EVT_SCROLL_PAGEDOWN(func) { wxEVT_SCROLL_PAGEDOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, NULL }, #define EVT_SCROLL_PAGEDOWN(func) { wxEVT_SCROLL_PAGEDOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL },
#define EVT_SCROLL_THUMBTRACK(func) { wxEVT_SCROLL_THUMBTRACK, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, NULL }, #define EVT_SCROLL_THUMBTRACK(func) { wxEVT_SCROLL_THUMBTRACK, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL },
// Scrolling, with an id // Scrolling, with an id
#define EVT_COMMAND_SCROLL(id, func) \ #define EVT_COMMAND_SCROLL(id, func) \
{ wxEVT_SCROLL_TOP, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, NULL },\ { wxEVT_SCROLL_TOP, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL },\
{ wxEVT_SCROLL_BOTTOM, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, NULL },\ { wxEVT_SCROLL_BOTTOM, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL },\
{ wxEVT_SCROLL_LINEUP, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, NULL },\ { wxEVT_SCROLL_LINEUP, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL },\
{ wxEVT_SCROLL_LINEDOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, NULL },\ { wxEVT_SCROLL_LINEDOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL },\
{ wxEVT_SCROLL_PAGEUP, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, NULL },\ { wxEVT_SCROLL_PAGEUP, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL },\
{ wxEVT_SCROLL_PAGEDOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, NULL },\ { wxEVT_SCROLL_PAGEDOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL },\
{ wxEVT_SCROLL_THUMBTRACK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, NULL }, { wxEVT_SCROLL_THUMBTRACK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL },
#define EVT_COMMAND_SCROLL_TOP(id, func) { wxEVT_SCROLL_TOP, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, NULL }, #define EVT_COMMAND_SCROLL_TOP(id, func) { wxEVT_SCROLL_TOP, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL },
#define EVT_COMMAND_SCROLL_BOTTOM(id, func) { wxEVT_SCROLL_BOTTOM, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, NULL }, #define EVT_COMMAND_SCROLL_BOTTOM(id, func) { wxEVT_SCROLL_BOTTOM, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL },
#define EVT_COMMAND_SCROLL_LINEUP(id, func) { wxEVT_SCROLL_LINEUP, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, NULL }, #define EVT_COMMAND_SCROLL_LINEUP(id, func) { wxEVT_SCROLL_LINEUP, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL },
#define EVT_COMMAND_SCROLL_LINEDOWN(id, func) { wxEVT_SCROLL_LINEDOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, NULL }, #define EVT_COMMAND_SCROLL_LINEDOWN(id, func) { wxEVT_SCROLL_LINEDOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL },
#define EVT_COMMAND_SCROLL_PAGEUP(id, func) { wxEVT_SCROLL_PAGEUP, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, NULL }, #define EVT_COMMAND_SCROLL_PAGEUP(id, func) { wxEVT_SCROLL_PAGEUP, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL },
#define EVT_COMMAND_SCROLL_PAGEDOWN(id, func) { wxEVT_SCROLL_PAGEDOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, NULL }, #define EVT_COMMAND_SCROLL_PAGEDOWN(id, func) { wxEVT_SCROLL_PAGEDOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL },
#define EVT_COMMAND_SCROLL_THUMBTRACK(id, func) { wxEVT_SCROLL_THUMBTRACK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, NULL }, #define EVT_COMMAND_SCROLL_THUMBTRACK(id, func) { wxEVT_SCROLL_THUMBTRACK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL },
// Convenience macros for commonly-used commands // Convenience macros for commonly-used commands
#define EVT_BUTTON(id, fn) { wxEVT_COMMAND_BUTTON_CLICKED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, NULL }, #define EVT_BUTTON(id, fn) { wxEVT_COMMAND_BUTTON_CLICKED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
#define EVT_CHECKBOX(id, fn) { wxEVT_COMMAND_CHECKBOX_CLICKED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, NULL }, #define EVT_CHECKBOX(id, fn) { wxEVT_COMMAND_CHECKBOX_CLICKED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
#define EVT_CHOICE(id, fn) { wxEVT_COMMAND_CHOICE_SELECTED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, NULL }, #define EVT_CHOICE(id, fn) { wxEVT_COMMAND_CHOICE_SELECTED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
#define EVT_LISTBOX(id, fn) { wxEVT_COMMAND_LISTBOX_SELECTED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, NULL }, #define EVT_LISTBOX(id, fn) { wxEVT_COMMAND_LISTBOX_SELECTED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
#define EVT_LISTBOX_DCLICK(id, fn) { wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, NULL }, #define EVT_LISTBOX_DCLICK(id, fn) { wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
#define EVT_TEXT(id, fn) { wxEVT_COMMAND_TEXT_UPDATED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, NULL }, #define EVT_TEXT(id, fn) { wxEVT_COMMAND_TEXT_UPDATED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
#define EVT_TEXT_ENTER(id, fn) { wxEVT_COMMAND_TEXT_ENTER, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, NULL }, #define EVT_TEXT_ENTER(id, fn) { wxEVT_COMMAND_TEXT_ENTER, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
#define EVT_MENU(id, fn) { wxEVT_COMMAND_MENU_SELECTED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, NULL }, #define EVT_MENU(id, fn) { wxEVT_COMMAND_MENU_SELECTED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
#define EVT_MENU_RANGE(id1, id2, fn) { wxEVT_COMMAND_MENU_SELECTED, id1, id2, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, NULL }, #define EVT_MENU_RANGE(id1, id2, fn) { wxEVT_COMMAND_MENU_SELECTED, id1, id2, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
#define EVT_SLIDER(id, fn) { wxEVT_COMMAND_SLIDER_UPDATED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, NULL }, #define EVT_SLIDER(id, fn) { wxEVT_COMMAND_SLIDER_UPDATED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
#define EVT_RADIOBOX(id, fn) { wxEVT_COMMAND_RADIOBOX_SELECTED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, NULL }, #define EVT_RADIOBOX(id, fn) { wxEVT_COMMAND_RADIOBOX_SELECTED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
#define EVT_RADIOBUTTON(id, fn) { wxEVT_COMMAND_RADIOBUTTON_SELECTED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, NULL }, #define EVT_RADIOBUTTON(id, fn) { wxEVT_COMMAND_RADIOBUTTON_SELECTED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
// EVT_SCROLLBAR is now obsolete since we use EVT_COMMAND_SCROLL... events // EVT_SCROLLBAR is now obsolete since we use EVT_COMMAND_SCROLL... events
#define EVT_SCROLLBAR(id, fn) { wxEVT_COMMAND_SCROLLBAR_UPDATED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, NULL }, #define EVT_SCROLLBAR(id, fn) { wxEVT_COMMAND_SCROLLBAR_UPDATED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
#define EVT_VLBOX(id, fn) { wxEVT_COMMAND_VLBOX_SELECTED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, NULL }, #define EVT_VLBOX(id, fn) { wxEVT_COMMAND_VLBOX_SELECTED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
#define EVT_COMBOBOX(id, fn) { wxEVT_COMMAND_COMBOBOX_SELECTED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, NULL }, #define EVT_COMBOBOX(id, fn) { wxEVT_COMMAND_COMBOBOX_SELECTED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
#define EVT_TOOL(id, fn) { wxEVT_COMMAND_TOOL_CLICKED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, NULL }, #define EVT_TOOL(id, fn) { wxEVT_COMMAND_TOOL_CLICKED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
#define EVT_TOOL_RANGE(id1, id2, fn) { wxEVT_COMMAND_TOOL_CLICKED, id1, id2, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, NULL }, #define EVT_TOOL_RANGE(id1, id2, fn) { wxEVT_COMMAND_TOOL_CLICKED, id1, id2, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
#define EVT_TOOL_RCLICKED(id, fn) { wxEVT_COMMAND_TOOL_RCLICKED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, NULL }, #define EVT_TOOL_RCLICKED(id, fn) { wxEVT_COMMAND_TOOL_RCLICKED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
#define EVT_TOOL_RCLICKED_RANGE(id1, id2, fn) { wxEVT_COMMAND_TOOL_RCLICKED, id1, id2, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, NULL }, #define EVT_TOOL_RCLICKED_RANGE(id1, id2, fn) { wxEVT_COMMAND_TOOL_RCLICKED, id1, id2, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
#define EVT_TOOL_ENTER(id, fn) { wxEVT_COMMAND_TOOL_ENTER, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, NULL }, #define EVT_TOOL_ENTER(id, fn) { wxEVT_COMMAND_TOOL_ENTER, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
#define EVT_CHECKLISTBOX(id, fn) { wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, NULL }, #define EVT_CHECKLISTBOX(id, fn) { wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
// Generic command events // Generic command events
#define EVT_COMMAND_LEFT_CLICK(id, fn) { wxEVT_COMMAND_LEFT_CLICK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, NULL }, #define EVT_COMMAND_LEFT_CLICK(id, fn) { wxEVT_COMMAND_LEFT_CLICK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
#define EVT_COMMAND_LEFT_DCLICK(id, fn) { wxEVT_COMMAND_LEFT_DCLICK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, NULL }, #define EVT_COMMAND_LEFT_DCLICK(id, fn) { wxEVT_COMMAND_LEFT_DCLICK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
#define EVT_COMMAND_RIGHT_CLICK(id, fn) { wxEVT_COMMAND_RIGHT_CLICK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, NULL }, #define EVT_COMMAND_RIGHT_CLICK(id, fn) { wxEVT_COMMAND_RIGHT_CLICK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
#define EVT_COMMAND_RIGHT_DCLICK(id, fn) { wxEVT_COMMAND_RIGHT_DCLICK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, NULL }, #define EVT_COMMAND_RIGHT_DCLICK(id, fn) { wxEVT_COMMAND_RIGHT_DCLICK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
#define EVT_COMMAND_SET_FOCUS(id, fn) { wxEVT_COMMAND_SET_FOCUS, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, NULL }, #define EVT_COMMAND_SET_FOCUS(id, fn) { wxEVT_COMMAND_SET_FOCUS, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
#define EVT_COMMAND_KILL_FOCUS(id, fn) { wxEVT_COMMAND_KILL_FOCUS, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, NULL }, #define EVT_COMMAND_KILL_FOCUS(id, fn) { wxEVT_COMMAND_KILL_FOCUS, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
#define EVT_COMMAND_ENTER(id, fn) { wxEVT_COMMAND_ENTER, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, NULL }, #define EVT_COMMAND_ENTER(id, fn) { wxEVT_COMMAND_ENTER, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
// Joystick events // Joystick events
#define EVT_JOY_DOWN(func) \ #define EVT_JOY_DOWN(func) \
{ wxEVT_JOY_BUTTON_DOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxJoystickEventFunction) & func, NULL }, { wxEVT_JOY_BUTTON_DOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxJoystickEventFunction) & func, (wxObject *) NULL },
#define EVT_JOY_UP(func) \ #define EVT_JOY_UP(func) \
{ wxEVT_JOY_BUTTON_UP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxJoystickEventFunction) & func, NULL }, { wxEVT_JOY_BUTTON_UP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxJoystickEventFunction) & func, (wxObject *) NULL },
#define EVT_JOY_MOVE(func) \ #define EVT_JOY_MOVE(func) \
{ wxEVT_JOY_MOVE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxJoystickEventFunction) & func, NULL }, { wxEVT_JOY_MOVE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxJoystickEventFunction) & func, (wxObject *) NULL },
#define EVT_JOY_ZMOVE(func) \ #define EVT_JOY_ZMOVE(func) \
{ wxEVT_JOY_ZMOVE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxJoystickEventFunction) & func, NULL }, { wxEVT_JOY_ZMOVE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxJoystickEventFunction) & func, (wxObject *) NULL },
// All joystick events // All joystick events
#define EVT_JOYSTICK_EVENTS(func) \ #define EVT_JOYSTICK_EVENTS(func) \
{ wxEVT_JOY_BUTTON_DOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxJoystickEventFunction) & func, NULL },\ { wxEVT_JOY_BUTTON_DOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxJoystickEventFunction) & func, (wxObject *) NULL },\
{ wxEVT_JOY_BUTTON_UP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxJoystickEventFunction) & func, NULL },\ { wxEVT_JOY_BUTTON_UP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxJoystickEventFunction) & func, (wxObject *) NULL },\
{ wxEVT_JOY_MOVE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxJoystickEventFunction) & func, NULL },\ { wxEVT_JOY_MOVE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxJoystickEventFunction) & func, (wxObject *) NULL },\
{ wxEVT_JOY_ZMOVE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxJoystickEventFunction) & func, NULL },\ { wxEVT_JOY_ZMOVE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxJoystickEventFunction) & func, (wxObject *) NULL },\
// Idle event // Idle event
#define EVT_IDLE(func) \ #define EVT_IDLE(func) \
{ wxEVT_IDLE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxIdleEventFunction) & func, NULL },\ { wxEVT_IDLE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxIdleEventFunction) & func, (wxObject *) NULL },\
// Update UI event // Update UI event
#define EVT_UPDATE_UI(id, func) \ #define EVT_UPDATE_UI(id, func) \
{ wxEVT_UPDATE_UI, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxUpdateUIEventFunction) & func, NULL },\ { wxEVT_UPDATE_UI, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxUpdateUIEventFunction) & func, (wxObject *) NULL },\
#endif #endif
// _WX_EVENTH__ // _WX_EVENTH__

6
include/wx/expr.h
View File

@@ -1,4 +1,4 @@
///////////////////////////////////////////////////////////////////////////// /* //////////////////////////////////////////////////////////////////////////
// Name: expr.h // Name: expr.h
// Purpose: C helper defines and functions for wxExpr class // Purpose: C helper defines and functions for wxExpr class
// Author: Julian Smart // Author: Julian Smart
@@ -7,7 +7,7 @@
// RCS-ID: $Id$ // RCS-ID: $Id$
// Copyright: (c) // Copyright: (c)
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////// */
#ifndef _WX_EXPRH__ #ifndef _WX_EXPRH__
#define _WX_EXPRH__ #define _WX_EXPRH__
@@ -126,4 +126,4 @@ void syntax_error();
#endif #endif
#endif #endif
// _WX_EXPRH__ /* _WX_EXPRH__ */

4
include/wx/fileconf.h
View File

@@ -166,8 +166,8 @@ public:
{ {
public: public:
// ctor // ctor
LineList(const wxString& str, LineList *pNext = NULL) : m_strLine(str) LineList(const wxString& str, LineList *pNext = (LineList *) NULL) : m_strLine(str)
{ SetNext(pNext); SetPrev(NULL); } { SetNext(pNext); SetPrev((LineList *) NULL); }
// //
LineList *Next() const { return m_pNext; } LineList *Next() const { return m_pNext; }

4
include/wx/filefn.h
View File

@@ -76,7 +76,7 @@ void WXDLLEXPORT wxStripExtension(char *buffer);
void WXDLLEXPORT wxStripExtension(wxString& buffer); void WXDLLEXPORT wxStripExtension(wxString& buffer);
// Get a temporary filename, opening and closing the file. // Get a temporary filename, opening and closing the file.
char* WXDLLEXPORT wxGetTempFileName(const wxString& prefix, char *buf = NULL); char* WXDLLEXPORT wxGetTempFileName(const wxString& prefix, char *buf = (char *) NULL);
// Expand file name (~/ and ${OPENWINHOME}/ stuff) // Expand file name (~/ and ${OPENWINHOME}/ stuff)
char* WXDLLEXPORT wxExpandPath(char *dest, const char *path); char* WXDLLEXPORT wxExpandPath(char *dest, const char *path);
@@ -125,7 +125,7 @@ bool WXDLLEXPORT wxRenameFile(const wxString& file1, const wxString& file2);
// copies into buf. // copies into buf.
// IMPORTANT NOTE getcwd is know not to work under some releases // IMPORTANT NOTE getcwd is know not to work under some releases
// of Win32s 1.3, according to MS release notes! // of Win32s 1.3, according to MS release notes!
char* WXDLLEXPORT wxGetWorkingDirectory(char *buf = NULL, int sz = 1000); char* WXDLLEXPORT wxGetWorkingDirectory(char *buf = (char *) NULL, int sz = 1000);
// Set working directory // Set working directory
bool WXDLLEXPORT wxSetWorkingDirectory(const wxString& d); bool WXDLLEXPORT wxSetWorkingDirectory(const wxString& d);

20
include/wx/generic/choicdgg.h
View File

@@ -29,15 +29,15 @@ class WXDLLEXPORT wxSingleChoiceDialog: public wxDialog
DECLARE_DYNAMIC_CLASS(wxSingleChoiceDialog) DECLARE_DYNAMIC_CLASS(wxSingleChoiceDialog)
public: public:
wxSingleChoiceDialog(wxWindow *parent, const wxString& message, const wxString& caption, wxSingleChoiceDialog(wxWindow *parent, const wxString& message, const wxString& caption,
int n, const wxString *choices, char **clientData = NULL, long style = wxOK|wxCANCEL|wxCENTRE, const wxPoint& pos = wxDefaultPosition); int n, const wxString *choices, char **clientData = (char **) NULL, long style = wxOK|wxCANCEL|wxCENTRE, const wxPoint& pos = wxDefaultPosition);
wxSingleChoiceDialog(wxWindow *parent, const wxString& message, const wxString& caption, wxSingleChoiceDialog(wxWindow *parent, const wxString& message, const wxString& caption,
const wxStringList& choices, char **clientData = NULL, long style = wxOK|wxCANCEL|wxCENTRE, const wxPoint& pos = wxDefaultPosition); const wxStringList& choices, char **clientData = (char **) NULL, long style = wxOK|wxCANCEL|wxCENTRE, const wxPoint& pos = wxDefaultPosition);
bool Create(wxWindow *parent, const wxString& message, const wxString& caption, bool Create(wxWindow *parent, const wxString& message, const wxString& caption,
int n, const wxString *choices, char **clientData = NULL, long style = wxOK|wxCANCEL|wxCENTRE, const wxPoint& pos = wxDefaultPosition); int n, const wxString *choices, char **clientData = (char **) NULL, long style = wxOK|wxCANCEL|wxCENTRE, const wxPoint& pos = wxDefaultPosition);
bool Create(wxWindow *parent, const wxString& message, const wxString& caption, bool Create(wxWindow *parent, const wxString& message, const wxString& caption,
const wxStringList& choices, char **clientData = NULL, long style = wxOK|wxCANCEL|wxCENTRE, const wxPoint& pos = wxDefaultPosition); const wxStringList& choices, char **clientData = (char **) NULL, long style = wxOK|wxCANCEL|wxCENTRE, const wxPoint& pos = wxDefaultPosition);
void SetSelection(int sel) ; void SetSelection(int sel) ;
inline int GetSelection(void) const { return m_selection; } inline int GetSelection(void) const { return m_selection; }
@@ -57,37 +57,37 @@ protected:
}; };
wxString WXDLLEXPORT wxGetSingleChoice(const wxString& message, const wxString& caption, wxString WXDLLEXPORT wxGetSingleChoice(const wxString& message, const wxString& caption,
int n, const wxString *choices, wxWindow *parent = NULL, int n, const wxString *choices, wxWindow *parent = (wxWindow *) NULL,
int x = -1, int y = -1, bool centre = TRUE, int x = -1, int y = -1, bool centre = TRUE,
int width = wxCHOICE_WIDTH, int height = wxCHOICE_HEIGHT); int width = wxCHOICE_WIDTH, int height = wxCHOICE_HEIGHT);
wxString WXDLLEXPORT wxGetSingleChoice(const wxString& message, const wxString& caption, wxString WXDLLEXPORT wxGetSingleChoice(const wxString& message, const wxString& caption,
int n, char *choices[], wxWindow *parent = NULL, int n, char *choices[], wxWindow *parent = (wxWindow *) NULL,
int x = -1, int y = -1, bool centre = TRUE, int x = -1, int y = -1, bool centre = TRUE,
int width = wxCHOICE_WIDTH, int height = wxCHOICE_HEIGHT); int width = wxCHOICE_WIDTH, int height = wxCHOICE_HEIGHT);
// Same as above but gets position in list of strings, instead of string, // Same as above but gets position in list of strings, instead of string,
// or -1 if no selection // or -1 if no selection
int WXDLLEXPORT wxGetSingleChoiceIndex(const wxString& message, const wxString& caption, int WXDLLEXPORT wxGetSingleChoiceIndex(const wxString& message, const wxString& caption,
int n, const wxString *choices, wxWindow *parent = NULL, int n, const wxString *choices, wxWindow *parent = (wxWindow *) NULL,
int x = -1, int y = -1, bool centre = TRUE, int x = -1, int y = -1, bool centre = TRUE,
int width = wxCHOICE_WIDTH, int height = wxCHOICE_HEIGHT); int width = wxCHOICE_WIDTH, int height = wxCHOICE_HEIGHT);
int WXDLLEXPORT wxGetSingleChoiceIndex(const wxString& message, const wxString& caption, int WXDLLEXPORT wxGetSingleChoiceIndex(const wxString& message, const wxString& caption,
int n, char *choices[], wxWindow *parent = NULL, int n, char *choices[], wxWindow *parent = (wxWindow *) NULL,
int x = -1, int y = -1, bool centre = TRUE, int x = -1, int y = -1, bool centre = TRUE,
int width = wxCHOICE_WIDTH, int height = wxCHOICE_HEIGHT); int width = wxCHOICE_WIDTH, int height = wxCHOICE_HEIGHT);
// Return client data instead // Return client data instead
char* WXDLLEXPORT wxGetSingleChoiceData(const wxString& message, const wxString& caption, char* WXDLLEXPORT wxGetSingleChoiceData(const wxString& message, const wxString& caption,
int n, const wxString *choices, char **client_data, int n, const wxString *choices, char **client_data,
wxWindow *parent = NULL, int x = -1, int y = -1, wxWindow *parent = (wxWindow *) NULL, int x = -1, int y = -1,
bool centre = TRUE, bool centre = TRUE,
int width = wxCHOICE_WIDTH, int height = wxCHOICE_HEIGHT); int width = wxCHOICE_WIDTH, int height = wxCHOICE_HEIGHT);
char* WXDLLEXPORT wxGetSingleChoiceData(const wxString& message, const wxString& caption, char* WXDLLEXPORT wxGetSingleChoiceData(const wxString& message, const wxString& caption,
int n, char *choices[], char **client_data, int n, char *choices[], char **client_data,
wxWindow *parent = NULL, int x = -1, int y = -1, wxWindow *parent = (wxWindow *) NULL, int x = -1, int y = -1,
bool centre = TRUE, bool centre = TRUE,
int width = wxCHOICE_WIDTH, int height = wxCHOICE_HEIGHT); int width = wxCHOICE_WIDTH, int height = wxCHOICE_HEIGHT);

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

@@ -76,10 +76,10 @@ class WXDLLEXPORT wxGenericColourDialog: public wxDialog
// static bool colourDialogCancelled; // static bool colourDialogCancelled;
public: public:
wxGenericColourDialog(void); wxGenericColourDialog(void);
wxGenericColourDialog(wxWindow *parent, wxColourData *data = NULL); wxGenericColourDialog(wxWindow *parent, wxColourData *data = (wxColourData *) NULL);
~wxGenericColourDialog(void); ~wxGenericColourDialog(void);
bool Create(wxWindow *parent, wxColourData *data = NULL); bool Create(wxWindow *parent, wxColourData *data = (wxColourData *) NULL);
int ShowModal(void); int ShowModal(void);
wxColourData GetColourData(void) { return colourData; } wxColourData GetColourData(void) { return colourData; }

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

@@ -60,10 +60,10 @@ class WXDLLEXPORT wxGenericFontDialog: public wxDialog
public: public:
wxGenericFontDialog(void); wxGenericFontDialog(void);
wxGenericFontDialog(wxWindow *parent, wxFontData *data = NULL); wxGenericFontDialog(wxWindow *parent, wxFontData *data = (wxFontData *) NULL);
~wxGenericFontDialog(void); ~wxGenericFontDialog(void);
bool Create(wxWindow *parent, wxFontData *data = NULL); bool Create(wxWindow *parent, wxFontData *data = (wxFontData *) NULL);
int ShowModal(void); int ShowModal(void);

4
include/wx/generic/gridg.h
View File

@@ -66,7 +66,7 @@ class WXDLLEXPORT wxGenericGrid: public wxPanel
bool Create(wxWindow *parent, wxWindowID, const wxPoint& pos, const wxSize& size, long style = 0, const wxString& name = "grid"); bool Create(wxWindow *parent, wxWindowID, const wxPoint& pos, const wxSize& size, long style = 0, const wxString& name = "grid");
bool CreateGrid(int nRows, int nCols, wxString **cellValues = NULL, short *widths = NULL, bool CreateGrid(int nRows, int nCols, wxString **cellValues = (wxString **) NULL, short *widths = (short *) NULL,
short defaultWidth = wxGRID_DEFAULT_CELL_WIDTH, short defaultHeight = wxGRID_DEFAULT_CELL_HEIGHT); short defaultWidth = wxGRID_DEFAULT_CELL_WIDTH, short defaultHeight = wxGRID_DEFAULT_CELL_HEIGHT);
void PaintGrid(wxDC& dc); void PaintGrid(wxDC& dc);
void ClearGrid(void); void ClearGrid(void);
@@ -290,7 +290,7 @@ class WXDLLEXPORT wxGridCell: public wxObject
wxBitmap *cellBitmap; wxBitmap *cellBitmap;
int alignment; int alignment;
wxGridCell(wxGenericGrid *window = NULL); wxGridCell(wxGenericGrid *window = (wxGenericGrid *) NULL);
~wxGridCell(void); ~wxGridCell(void);
virtual wxString& GetTextValue(void) { return textValue; } virtual wxString& GetTextValue(void) { return textValue; }

26
include/wx/generic/listctrl.h
View File

@@ -209,19 +209,19 @@ class WXDLLEXPORT wxListEvent: public wxCommandEvent
typedef void (wxEvtHandler::*wxListEventFunction)(wxListEvent&); typedef void (wxEvtHandler::*wxListEventFunction)(wxListEvent&);
#define EVT_LIST_BEGIN_DRAG(id, fn) { wxEVT_COMMAND_LIST_BEGIN_DRAG, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxListEventFunction) & fn, NULL }, #define EVT_LIST_BEGIN_DRAG(id, fn) { wxEVT_COMMAND_LIST_BEGIN_DRAG, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxListEventFunction) & fn, (wxObject *) NULL },
#define EVT_LIST_BEGIN_RDRAG(id, fn) { wxEVT_COMMAND_LIST_BEGIN_RDRAG, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxListEventFunction) & fn, NULL }, #define EVT_LIST_BEGIN_RDRAG(id, fn) { wxEVT_COMMAND_LIST_BEGIN_RDRAG, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxListEventFunction) & fn, (wxObject *) NULL },
#define EVT_LIST_BEGIN_LABEL_EDIT(id, fn) { wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxListEventFunction) & fn, NULL }, #define EVT_LIST_BEGIN_LABEL_EDIT(id, fn) { wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxListEventFunction) & fn, (wxObject *) NULL },
#define EVT_LIST_END_LABEL_EDIT(id, fn) { wxEVT_COMMAND_LIST_END_LABEL_EDIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxListEventFunction) & fn, NULL }, #define EVT_LIST_END_LABEL_EDIT(id, fn) { wxEVT_COMMAND_LIST_END_LABEL_EDIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxListEventFunction) & fn, (wxObject *) NULL },
#define EVT_LIST_DELETE_ITEM(id, fn) { wxEVT_COMMAND_LIST_DELETE_ITEM, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxListEventFunction) & fn, NULL }, #define EVT_LIST_DELETE_ITEM(id, fn) { wxEVT_COMMAND_LIST_DELETE_ITEM, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxListEventFunction) & fn, (wxObject *) NULL },
#define EVT_LIST_DELETE_ALL_ITEMS(id, fn) { wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxListEventFunction) & fn, NULL }, #define EVT_LIST_DELETE_ALL_ITEMS(id, fn) { wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxListEventFunction) & fn, (wxObject *) NULL },
#define EVT_LIST_GET_INFO(id, fn) { wxEVT_COMMAND_LIST_GET_INFO, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxListEventFunction) & fn, NULL }, #define EVT_LIST_GET_INFO(id, fn) { wxEVT_COMMAND_LIST_GET_INFO, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxListEventFunction) & fn, (wxObject *) NULL },
#define EVT_LIST_SET_INFO(id, fn) { wxEVT_COMMAND_LIST_SET_INFO, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxListEventFunction) & fn, NULL }, #define EVT_LIST_SET_INFO(id, fn) { wxEVT_COMMAND_LIST_SET_INFO, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxListEventFunction) & fn, (wxObject *) NULL },
#define EVT_LIST_ITEM_SELECTED(id, fn) { wxEVT_COMMAND_LIST_ITEM_SELECTED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxListEventFunction) & fn, NULL }, #define EVT_LIST_ITEM_SELECTED(id, fn) { wxEVT_COMMAND_LIST_ITEM_SELECTED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxListEventFunction) & fn, (wxObject *) NULL },
#define EVT_LIST_ITEM_DESELECTED(id, fn) { wxEVT_COMMAND_LIST_ITEM_DESELECTED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxListEventFunction) & fn, NULL }, #define EVT_LIST_ITEM_DESELECTED(id, fn) { wxEVT_COMMAND_LIST_ITEM_DESELECTED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxListEventFunction) & fn, (wxObject *) NULL },
#define EVT_LIST_KEY_DOWN(id, fn) { wxEVT_COMMAND_LIST_KEY_DOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxListEventFunction) & fn, NULL }, #define EVT_LIST_KEY_DOWN(id, fn) { wxEVT_COMMAND_LIST_KEY_DOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxListEventFunction) & fn, (wxObject *) NULL },
#define EVT_LIST_INSERT_ITEM(id, fn) { wxEVT_COMMAND_LIST_INSERT_ITEM, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxListEventFunction) & fn, NULL }, #define EVT_LIST_INSERT_ITEM(id, fn) { wxEVT_COMMAND_LIST_INSERT_ITEM, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxListEventFunction) & fn, (wxObject *) NULL },
#define EVT_LIST_COL_CLICK(id, fn) { wxEVT_COMMAND_LIST_COL_CLICK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxListEventFunction) & fn, NULL }, #define EVT_LIST_COL_CLICK(id, fn) { wxEVT_COMMAND_LIST_COL_CLICK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxListEventFunction) & fn, (wxObject *) NULL },
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

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

@@ -44,7 +44,7 @@ DECLARE_EVENT_TABLE()
#define wxMessageDialog wxGenericMessageDialog #define wxMessageDialog wxGenericMessageDialog
int wxMessageBox(const wxString& message, const wxString& caption = wxMessageBoxCaptionStr, int wxMessageBox(const wxString& message, const wxString& caption = wxMessageBoxCaptionStr,
long style = wxOK|wxCENTRE, wxWindow *parent = NULL, int x = -1, int y = -1); long style = wxOK|wxCENTRE, wxWindow *parent = (wxWindow *) NULL, int x = -1, int y = -1);
#endif #endif

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

@@ -66,7 +66,7 @@ public:
void OnNavigationKey(wxNavigationKeyEvent& event); void OnNavigationKey(wxNavigationKeyEvent& event);
protected: protected:
bool SetFocusToNextChild(wxNode *nodeCurrent = NULL, bool bForward = TRUE); bool SetFocusToNextChild(wxNode *nodeCurrent = (wxNode *) NULL, bool bForward = TRUE);
DECLARE_DYNAMIC_CLASS(wxPanel) DECLARE_DYNAMIC_CLASS(wxPanel)
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()

4
include/wx/generic/printps.h
View File

@@ -28,7 +28,7 @@ class WXDLLEXPORT wxPostScriptPrinter: public wxPrinterBase
DECLARE_DYNAMIC_CLASS(wxPostScriptPrinter) DECLARE_DYNAMIC_CLASS(wxPostScriptPrinter)
public: public:
wxPostScriptPrinter(wxPrintData *data = NULL); wxPostScriptPrinter(wxPrintData *data = (wxPrintData *) NULL);
~wxPostScriptPrinter(void); ~wxPostScriptPrinter(void);
virtual bool Print(wxWindow *parent, wxPrintout *printout, bool prompt = TRUE); virtual bool Print(wxWindow *parent, wxPrintout *printout, bool prompt = TRUE);
@@ -46,7 +46,7 @@ class WXDLLEXPORT wxPostScriptPrintPreview: public wxPrintPreviewBase
DECLARE_CLASS(wxPostScriptPrintPreview) DECLARE_CLASS(wxPostScriptPrintPreview)
public: public:
wxPostScriptPrintPreview(wxPrintout *printout, wxPrintout *printoutForPrinting = NULL, wxPrintData *data = NULL); wxPostScriptPrintPreview(wxPrintout *printout, wxPrintout *printoutForPrinting = (wxPrintout *) NULL, wxPrintData *data = (wxPrintData *) NULL);
~wxPostScriptPrintPreview(void); ~wxPostScriptPrintPreview(void);
virtual bool Print(bool interactive); virtual bool Print(bool interactive);

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

@@ -127,7 +127,7 @@ class WXDLLEXPORT wxGenericPageSetupDialog: public wxDialog
wxPageSetupData pageData; wxPageSetupData pageData;
wxGenericPageSetupDialog(wxWindow *parent, wxPageSetupData* data = NULL); wxGenericPageSetupDialog(wxWindow *parent, wxPageSetupData* data = (wxPageSetupData*) NULL);
~wxGenericPageSetupDialog(void); ~wxGenericPageSetupDialog(void);
virtual bool TransferDataFromWindow(void); virtual bool TransferDataFromWindow(void);

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

@@ -85,7 +85,7 @@ class WXDLLEXPORT wxSplitterWindow: public wxWindow
// Removes the specified (or second) window from the view // Removes the specified (or second) window from the view
// Doesn't actually delete the window. // Doesn't actually delete the window.
bool Unsplit(wxWindow *toRemove = NULL); bool Unsplit(wxWindow *toRemove = (wxWindow *) NULL);
// Is the window split? // Is the window split?
inline bool IsSplit(void) const { return (m_windowTwo != NULL); } inline bool IsSplit(void) const { return (m_windowTwo != NULL); }

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

@@ -44,7 +44,7 @@ public:
const wxString& name = wxPanelNameStr); const wxString& name = wxPanelNameStr);
// Create status line // Create status line
virtual void SetFieldsCount(int number=1, const int widths[] = NULL); virtual void SetFieldsCount(int number=1, const int widths[] = (const int *) NULL);
inline int GetFieldsCount() const { return m_nFields; } inline int GetFieldsCount() const { return m_nFields; }
// Set status line text // Set status line text

4
include/wx/generic/tabg.h
View File

@@ -32,7 +32,7 @@ class wxTabControl: public wxObject
{ {
DECLARE_DYNAMIC_CLASS(wxTabControl) DECLARE_DYNAMIC_CLASS(wxTabControl)
public: public:
wxTabControl(wxTabView *v = NULL); wxTabControl(wxTabView *v = (wxTabView *) NULL);
~wxTabControl(void); ~wxTabControl(void);
virtual void OnDraw(wxDC& dc, bool lastInRow); virtual void OnDraw(wxDC& dc, bool lastInRow);
@@ -112,7 +112,7 @@ public:
inline wxWindow* GetWindow(void) const { return m_window; } inline wxWindow* GetWindow(void) const { return m_window; }
// Automatically positions tabs // Automatically positions tabs
wxTabControl *AddTab(int id, const wxString& label, wxTabControl *existingTab = NULL); wxTabControl *AddTab(int id, const wxString& label, wxTabControl *existingTab = (wxTabControl *) NULL);
void ClearTabs(bool deleteTabs = TRUE); void ClearTabs(bool deleteTabs = TRUE);

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

@@ -44,7 +44,7 @@ DECLARE_EVENT_TABLE()
}; };
wxString WXDLLEXPORT wxGetTextFromUser(const wxString& message, const wxString& caption = wxGetTextFromUserPromptStr, wxString WXDLLEXPORT wxGetTextFromUser(const wxString& message, const wxString& caption = wxGetTextFromUserPromptStr,
const wxString& default_value = wxEmptyString, wxWindow *parent = NULL, const wxString& default_value = wxEmptyString, wxWindow *parent = (wxWindow *) NULL,
int x = -1, int y = -1, bool centre = TRUE); int x = -1, int y = -1, bool centre = TRUE);
#endif #endif

28
include/wx/generic/treectrl.h
View File

@@ -185,20 +185,20 @@ class WXDLLEXPORT wxTreeEvent: public wxCommandEvent
typedef void (wxEvtHandler::*wxTreeEventFunction)(wxTreeEvent&); typedef void (wxEvtHandler::*wxTreeEventFunction)(wxTreeEvent&);
#define EVT_TREE_BEGIN_DRAG(id, fn) { wxEVT_COMMAND_TREE_BEGIN_DRAG, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, #define EVT_TREE_BEGIN_DRAG(id, fn) { wxEVT_COMMAND_TREE_BEGIN_DRAG, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL },
#define EVT_TREE_BEGIN_RDRAG(id, fn) { wxEVT_COMMAND_TREE_BEGIN_RDRAG, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, #define EVT_TREE_BEGIN_RDRAG(id, fn) { wxEVT_COMMAND_TREE_BEGIN_RDRAG, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL },
#define EVT_TREE_BEGIN_LABEL_EDIT(id, fn) { wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, #define EVT_TREE_BEGIN_LABEL_EDIT(id, fn) { wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL },
#define EVT_TREE_END_LABEL_EDIT(id, fn) { wxEVT_COMMAND_TREE_END_LABEL_EDIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, #define EVT_TREE_END_LABEL_EDIT(id, fn) { wxEVT_COMMAND_TREE_END_LABEL_EDIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL },
#define EVT_TREE_DELETE_ITEM(id, fn) { wxEVT_COMMAND_TREE_DELETE_ITEM, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, #define EVT_TREE_DELETE_ITEM(id, fn) { wxEVT_COMMAND_TREE_DELETE_ITEM, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL },
#define EVT_TREE_GET_INFO(id, fn) { wxEVT_COMMAND_TREE_GET_INFO, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, #define EVT_TREE_GET_INFO(id, fn) { wxEVT_COMMAND_TREE_GET_INFO, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL },
#define EVT_TREE_SET_INFO(id, fn) { wxEVT_COMMAND_TREE_SET_INFO, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, #define EVT_TREE_SET_INFO(id, fn) { wxEVT_COMMAND_TREE_SET_INFO, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL },
#define EVT_TREE_ITEM_EXPANDED(id, fn) { wxEVT_COMMAND_TREE_ITEM_EXPANDED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, #define EVT_TREE_ITEM_EXPANDED(id, fn) { wxEVT_COMMAND_TREE_ITEM_EXPANDED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL },
#define EVT_TREE_ITEM_EXPANDING(id, fn) { wxEVT_COMMAND_TREE_ITEM_EXPANDING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, #define EVT_TREE_ITEM_EXPANDING(id, fn) { wxEVT_COMMAND_TREE_ITEM_EXPANDING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL },
#define EVT_TREE_ITEM_COLLAPSED(id, fn) { wxEVT_COMMAND_TREE_ITEM_COLLAPSED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, #define EVT_TREE_ITEM_COLLAPSED(id, fn) { wxEVT_COMMAND_TREE_ITEM_COLLAPSED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL },
#define EVT_TREE_ITEM_COLLAPSING(id, fn) { wxEVT_COMMAND_TREE_ITEM_COLLAPSING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, #define EVT_TREE_ITEM_COLLAPSING(id, fn) { wxEVT_COMMAND_TREE_ITEM_COLLAPSING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL },
#define EVT_TREE_SEL_CHANGED(id, fn) { wxEVT_COMMAND_TREE_SEL_CHANGED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, #define EVT_TREE_SEL_CHANGED(id, fn) { wxEVT_COMMAND_TREE_SEL_CHANGED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL },
#define EVT_TREE_SEL_CHANGING(id, fn) { wxEVT_COMMAND_TREE_SEL_CHANGING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, #define EVT_TREE_SEL_CHANGING(id, fn) { wxEVT_COMMAND_TREE_SEL_CHANGING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL },
#define EVT_TREE_KEY_DOWN(id, fn) { wxEVT_COMMAND_TREE_KEY_DOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, #define EVT_TREE_KEY_DOWN(id, fn) { wxEVT_COMMAND_TREE_KEY_DOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL },
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxGenericTreeItem // wxGenericTreeItem

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

@@ -110,7 +110,7 @@ class wxBitmap: public wxObject
void Resize( int height, int width ); void Resize( int height, int width );
bool SaveFile( const wxString &name, int type, wxPalette *palette = NULL ); bool SaveFile( const wxString &name, int type, wxPalette *palette = (wxPalette *) NULL );
bool LoadFile( const wxString &name, int type = wxBITMAP_TYPE_XPM); bool LoadFile( const wxString &name, int type = wxBITMAP_TYPE_XPM);
wxPalette *GetPalette() const; wxPalette *GetPalette() const;

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

@@ -47,7 +47,7 @@ class wxChoice: public wxControl
inline wxChoice( wxWindow *parent, wxWindowID id, inline wxChoice( wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
int n = 0, const wxString choices[] = NULL, int n = 0, const wxString choices[] = (const wxString *) NULL,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxChoiceNameStr ) const wxString& name = wxChoiceNameStr )
@@ -57,7 +57,7 @@ class wxChoice: public wxControl
bool Create( wxWindow *parent, wxWindowID id, bool Create( wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
int n = 0, const wxString choices[] = NULL, int n = 0, const wxString choices[] = (wxString *) NULL,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxChoiceNameStr ); const wxString& name = wxChoiceNameStr );

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

@@ -48,7 +48,7 @@ class wxComboBox: public wxControl
const wxString& value = wxEmptyString, const wxString& value = wxEmptyString,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
int n = 0, const wxString choices[] = NULL, int n = 0, const wxString choices[] = (const wxString *) NULL,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxComboBoxNameStr) const wxString& name = wxComboBoxNameStr)
@@ -59,7 +59,7 @@ class wxComboBox: public wxControl
const wxString& value = wxEmptyString, const wxString& value = wxEmptyString,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
int n = 0, const wxString choices[] = NULL, int n = 0, const wxString choices[] = (const wxString *) NULL,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxComboBoxNameStr); const wxString& name = wxComboBoxNameStr);

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

@@ -105,8 +105,8 @@ class wxDC: public wxObject
virtual void DrawText( const wxString &text, long x, long y, bool use16 = FALSE ) = 0; virtual void DrawText( const wxString &text, long x, long y, bool use16 = FALSE ) = 0;
virtual bool CanGetTextExtent(void) const = 0; virtual bool CanGetTextExtent(void) const = 0;
virtual void GetTextExtent( const wxString &string, long *width, long *height, virtual void GetTextExtent( const wxString &string, long *width, long *height,
long *descent = NULL, long *externalLeading = NULL, long *descent = (long *) NULL, long *externalLeading = (long *) NULL,
wxFont *theFont = NULL, bool use16 = FALSE ) = 0; wxFont *theFont = (wxFont *) NULL, bool use16 = FALSE ) = 0;
virtual long GetCharWidth(void) = 0; virtual long GetCharWidth(void) = 0;
virtual long GetCharHeight(void) = 0; virtual long GetCharHeight(void) = 0;

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

@@ -70,8 +70,8 @@ class wxPaintDC: public wxDC
virtual void DrawText( const wxString &text, long x, long y, bool use16 = FALSE ); virtual void DrawText( const wxString &text, long x, long y, bool use16 = FALSE );
virtual bool CanGetTextExtent(void) const; virtual bool CanGetTextExtent(void) const;
virtual void GetTextExtent( const wxString &string, long *width, long *height, virtual void GetTextExtent( const wxString &string, long *width, long *height,
long *descent = NULL, long *externalLeading = NULL, long *descent = (long *) NULL, long *externalLeading = (long *) NULL,
wxFont *theFont = NULL, bool use16 = FALSE ); wxFont *theFont = (wxFont *) NULL, bool use16 = FALSE );
virtual long GetCharWidth(void); virtual long GetCharWidth(void);
virtual long GetCharHeight(void); virtual long GetCharHeight(void);

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

@@ -23,7 +23,7 @@ class WXDLLEXPORT wxScreenDC: public wxPaintDC
~wxScreenDC(void); ~wxScreenDC(void);
static bool StartDrawingOnTop( wxWindow *window ); static bool StartDrawingOnTop( wxWindow *window );
static bool StartDrawingOnTop( wxRectangle *rect = NULL ); static bool StartDrawingOnTop( wxRectangle *rect = (wxRectangle *) NULL );
static bool EndDrawingOnTop(void); static bool EndDrawingOnTop(void);
}; };

14
include/wx/gtk/filedlg.h
View File

@@ -79,16 +79,16 @@ class wxFileDialog: public wxDialog
// File selector - backward compatibility // File selector - backward compatibility
char* wxFileSelector(const char *message = wxFileSelectorPromptStr, const char *default_path = NULL, char* wxFileSelector(const char *message = wxFileSelectorPromptStr, const char *default_path = (const char *) NULL,
const char *default_filename = NULL, const char *default_extension = NULL, const char *default_filename = (const char *) NULL, const char *default_extension = (const char *) NULL,
const char *wildcard = wxFileSelectorDefaultWildcardStr, int flags = 0, const char *wildcard = wxFileSelectorDefaultWildcardStr, int flags = 0,
wxWindow *parent = NULL, int x = -1, int y = -1); wxWindow *parent = (wxWindow *) NULL, int x = -1, int y = -1);
char* wxLoadFileSelector(const char *what, const char *extension, const char *default_name = NULL, char* wxLoadFileSelector(const char *what, const char *extension, const char *default_name = (const char *) NULL,
wxWindow *parent = NULL); wxWindow *parent = (wxWindow *) NULL);
char* wxSaveFileSelector(const char *what, const char *extension, const char *default_name = NULL, char* wxSaveFileSelector(const char *what, const char *extension, const char *default_name = (const char *) NULL,
wxWindow *parent = NULL); wxWindow *parent = (wxWindow *) NULL);

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

@@ -50,7 +50,7 @@ class wxFont: public wxGDIObject
public: public:
wxFont(void); wxFont(void);
wxFont( int PointSize, int FontIdOrFamily, int Style, int Weight, wxFont( int PointSize, int FontIdOrFamily, int Style, int Weight,
bool underlined = FALSE, const char *Face=NULL ); bool underlined = FALSE, const char *Face= ( const char *) NULL );
wxFont( int PointSize, const char *Face, int Family, int Style, int Weight, wxFont( int PointSize, const char *Face, int Family, int Style, int Weight,
bool underlined = FALSE ); bool underlined = FALSE );
wxFont( const wxFont& font ); wxFont( const wxFont& font );

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

@@ -48,7 +48,7 @@ class wxListBox: public wxControl
inline wxListBox( wxWindow *parent, wxWindowID id, inline wxListBox( wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
int n = 0, const wxString choices[] = NULL, int n = 0, const wxString choices[] = (const wxString *) NULL,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxListBoxNameStr ) const wxString& name = wxListBoxNameStr )
@@ -58,7 +58,7 @@ class wxListBox: public wxControl
bool Create( wxWindow *parent, wxWindowID id, bool Create( wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
int n = 0, const wxString choices[] = NULL, int n = 0, const wxString choices[] = (const wxString *) NULL,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxListBoxNameStr ); const wxString& name = wxListBoxNameStr );

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

@@ -126,8 +126,8 @@ class wxMDIChildFrame: public wxFrame
virtual void Activate(void); virtual void Activate(void);
// no status bars // no status bars
virtual wxStatusBar* CreateStatusBar( int WXUNUSED(number), long WXUNUSED(style), virtual wxStatusBar* CreateStatusBar( int WXUNUSED(number)=1, long WXUNUSED(style)=1,
wxWindowID WXUNUSED(id), const wxString& WXUNUSED(name) ) {return (wxStatusBar*)NULL; } wxWindowID WXUNUSED(id)=1, const wxString& WXUNUSED(name)=WXSTRINGCAST NULL ) {return (wxStatusBar*)NULL; }
virtual wxStatusBar *GetStatusBar() { return (wxStatusBar*)NULL; } virtual wxStatusBar *GetStatusBar() { return (wxStatusBar*)NULL; }
virtual void SetStatusText( const wxString &WXUNUSED(text), int WXUNUSED(number) ) {} virtual void SetStatusText( const wxString &WXUNUSED(text), int WXUNUSED(number) ) {}
virtual void SetStatusWidths( int WXUNUSED(n), int *WXUNUSED(width) ) {} virtual void SetStatusWidths( int WXUNUSED(n), int *WXUNUSED(width) ) {}

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

@@ -124,7 +124,7 @@ DECLARE_DYNAMIC_CLASS(wxMenu)
public: public:
// construction // construction
wxMenu( const wxString& title = wxEmptyString, const wxFunction func = NULL ); wxMenu( const wxString& title = wxEmptyString, const wxFunction func = (wxFunction) NULL );
// operations // operations
// title // title

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

@@ -48,7 +48,7 @@ class wxRadioBox: public wxControl
wxRadioBox(void); wxRadioBox(void);
inline wxRadioBox( wxWindow *parent, wxWindowID id, const wxString& title, inline wxRadioBox( wxWindow *parent, wxWindowID id, const wxString& title,
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
int n = 0, const wxString choices[] = NULL, int n = 0, const wxString choices[] = (const wxString *) NULL,
int majorDim = 0, long style = wxRA_HORIZONTAL, int majorDim = 0, long style = wxRA_HORIZONTAL,
const wxValidator& val = wxDefaultValidator, const wxValidator& val = wxDefaultValidator,
const wxString& name = wxRadioBoxNameStr ) const wxString& name = wxRadioBoxNameStr )
@@ -57,7 +57,7 @@ class wxRadioBox: public wxControl
} }
bool Create( wxWindow *parent, wxWindowID id, const wxString& title, bool Create( wxWindow *parent, wxWindowID id, const wxString& title,
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
int n = 0, const wxString choices[] = NULL, int n = 0, const wxString choices[] = (const wxString *) NULL,
int majorDim = 0, long style = wxRA_HORIZONTAL, int majorDim = 0, long style = wxRA_HORIZONTAL,
const wxValidator& val = wxDefaultValidator, const wxValidator& val = wxDefaultValidator,
const wxString& name = wxRadioBoxNameStr ); const wxString& name = wxRadioBoxNameStr );

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

@@ -42,7 +42,7 @@ class wxScrollBar: public wxControl
public: public:
wxScrollBar(void) { m_adjust = NULL; m_oldPos = 0.0; }; wxScrollBar(void) { m_adjust = (GtkAdjustment *) NULL; m_oldPos = 0.0; };
inline wxScrollBar( wxWindow *parent, wxWindowID id, inline wxScrollBar( wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,

6
include/wx/gtk/tbargtk.h
View File

@@ -52,9 +52,9 @@ class wxToolBarTool: public wxObject
wxToolBarTool(void) {}; wxToolBarTool(void) {};
wxToolBarTool( wxToolBar *owner, int theIndex = 0, wxToolBarTool( wxToolBar *owner, int theIndex = 0,
const wxBitmap& bitmap1 = wxNullBitmap, const wxBitmap& bitmap2 = wxNullBitmap, const wxBitmap& bitmap1 = wxNullBitmap, const wxBitmap& bitmap2 = wxNullBitmap,
bool toggle = FALSE, wxObject *clientData = NULL, bool toggle = FALSE, wxObject *clientData = (wxObject *) NULL,
const wxString& shortHelpString = "", const wxString& longHelpString = "", const wxString& shortHelpString = "", const wxString& longHelpString = "",
GtkWidget *item = NULL ); GtkWidget *item = (GtkWidget *) NULL );
~wxToolBarTool(void); ~wxToolBarTool(void);
public: public:
@@ -110,7 +110,7 @@ class wxToolBar: public wxControl
// If toggle is TRUE, the button toggles between the two states. // If toggle is TRUE, the button toggles between the two states.
virtual wxToolBarTool *AddTool( int toolIndex, const wxBitmap& bitmap, virtual wxToolBarTool *AddTool( int toolIndex, const wxBitmap& bitmap,
const wxBitmap& pushedBitmap = wxNullBitmap, bool toggle = FALSE, const wxBitmap& pushedBitmap = wxNullBitmap, bool toggle = FALSE,
float xPos = -1, float yPos = -1, wxObject *clientData = NULL, float xPos = -1, float yPos = -1, wxObject *clientData = (wxObject *)NULL,
const wxString& helpString1 = "", const wxString& helpString2 = ""); const wxString& helpString1 = "", const wxString& helpString2 = "");
virtual void AddSeparator(void); virtual void AddSeparator(void);
virtual void ClearTools(void); virtual void ClearTools(void);

28
include/wx/gtk/treectrl.h
View File

@@ -315,20 +315,20 @@ class WXDLLEXPORT wxTreeEvent: public wxCommandEvent
typedef void (wxEvtHandler::*wxTreeEventFunction)(wxTreeEvent&); typedef void (wxEvtHandler::*wxTreeEventFunction)(wxTreeEvent&);
#define EVT_TREE_BEGIN_DRAG(id, fn) { wxEVT_COMMAND_TREE_BEGIN_DRAG, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, #define EVT_TREE_BEGIN_DRAG(id, fn) { wxEVT_COMMAND_TREE_BEGIN_DRAG, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL },
#define EVT_TREE_BEGIN_RDRAG(id, fn) { wxEVT_COMMAND_TREE_BEGIN_RDRAG, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, #define EVT_TREE_BEGIN_RDRAG(id, fn) { wxEVT_COMMAND_TREE_BEGIN_RDRAG, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL },
#define EVT_TREE_BEGIN_LABEL_EDIT(id, fn) { wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn , NULL }, #define EVT_TREE_BEGIN_LABEL_EDIT(id, fn) { wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn , (wxObject *) NULL },
#define EVT_TREE_END_LABEL_EDIT(id, fn) { wxEVT_COMMAND_TREE_END_LABEL_EDIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, #define EVT_TREE_END_LABEL_EDIT(id, fn) { wxEVT_COMMAND_TREE_END_LABEL_EDIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL },
#define EVT_TREE_DELETE_ITEM(id, fn) { wxEVT_COMMAND_TREE_DELETE_ITEM, id, -1, ( wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, #define EVT_TREE_DELETE_ITEM(id, fn) { wxEVT_COMMAND_TREE_DELETE_ITEM, id, -1, ( wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL },
#define EVT_TREE_GET_INFO(id, fn) { wxEVT_COMMAND_TREE_GET_INFO, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, #define EVT_TREE_GET_INFO(id, fn) { wxEVT_COMMAND_TREE_GET_INFO, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL },
#define EVT_TREE_SET_INFO(id, fn) { wxEVT_COMMAND_TREE_SET_INFO, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, #define EVT_TREE_SET_INFO(id, fn) { wxEVT_COMMAND_TREE_SET_INFO, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL },
#define EVT_TREE_ITEM_EXPANDED(id, fn) { wxEVT_COMMAND_TREE_ITEM_EXPANDED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, #define EVT_TREE_ITEM_EXPANDED(id, fn) { wxEVT_COMMAND_TREE_ITEM_EXPANDED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL },
#define EVT_TREE_ITEM_EXPANDING(id, fn) { wxEVT_COMMAND_TREE_ITEM_EXPANDING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, #define EVT_TREE_ITEM_EXPANDING(id, fn) { wxEVT_COMMAND_TREE_ITEM_EXPANDING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL },
#define EVT_TREE_ITEM_COLLAPSED(id, fn) { wxEVT_COMMAND_TREE_ITEM_COLLAPSED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, #define EVT_TREE_ITEM_COLLAPSED(id, fn) { wxEVT_COMMAND_TREE_ITEM_COLLAPSED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL },
#define EVT_TREE_ITEM_COLLAPSING(id, fn) { wxEVT_COMMAND_TREE_ITEM_COLLAPSING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, #define EVT_TREE_ITEM_COLLAPSING(id, fn) { wxEVT_COMMAND_TREE_ITEM_COLLAPSING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL },
#define EVT_TREE_SEL_CHANGED(id, fn) { wxEVT_COMMAND_TREE_SEL_CHANGED, id, -1, ( wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, #define EVT_TREE_SEL_CHANGED(id, fn) { wxEVT_COMMAND_TREE_SEL_CHANGED, id, -1, ( wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL },
#define EVT_TREE_SEL_CHANGING(id, fn) { wxEVT_COMMAND_TREE_SEL_CHANGING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, #define EVT_TREE_SEL_CHANGING(id, fn) { wxEVT_COMMAND_TREE_SEL_CHANGING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL },
#define EVT_TREE_KEY_DOWN(id, fn) { wxEVT_COMMAND_TREE_KEY_DOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, #define EVT_TREE_KEY_DOWN(id, fn) { wxEVT_COMMAND_TREE_KEY_DOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL },
#endif #endif
// __GTKTREECTRL_H__ // __GTKTREECTRL_H__

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

@@ -1,4 +1,4 @@
///////////////////////////////////////////////////////////////////////////// /* ///////////////////////////////////////////////////////////////////////////
// Name: win_gtk.h // Name: win_gtk.h
// Purpose: wxWindows's GTK base widget // Purpose: wxWindows's GTK base widget
// Author: Robert Roebling // Author: Robert Roebling
@@ -6,7 +6,7 @@
// Id: // Id:
// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem // Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////// */
#ifndef __GTK_MYFIXED_H__ #ifndef __GTK_MYFIXED_H__

14
include/wx/gtk/window.h
View File

@@ -77,8 +77,8 @@ public:
const wxString& name = wxPanelNameStr); const wxString& name = wxPanelNameStr);
virtual ~wxWindow(); virtual ~wxWindow();
virtual bool LoadFromResource(wxWindow *parent, const wxString& resourceName, const wxResourceTable *table = NULL); virtual bool LoadFromResource(wxWindow *parent, const wxString& resourceName, const wxResourceTable *table = (const wxResourceTable *) NULL);
virtual wxControl *CreateItem(const wxItemResource *childResource, const wxResourceTable *table = NULL); virtual wxControl *CreateItem(const wxItemResource *childResource, const wxResourceTable *table = (const wxResourceTable *) NULL);
bool Close( bool force = FALSE ); bool Close( bool force = FALSE );
virtual bool Destroy(); virtual bool Destroy();
@@ -139,7 +139,7 @@ public:
void SetCursor( const wxCursor &cursor ); void SetCursor( const wxCursor &cursor );
virtual void Refresh( bool eraseBackground = TRUE, const wxRect *rect = NULL ); virtual void Refresh( bool eraseBackground = TRUE, const wxRect *rect = (const wxRect *) NULL );
virtual void Clear(); virtual void Clear();
virtual bool IsExposed( long x, long y ); virtual bool IsExposed( long x, long y );
virtual bool IsExposed( long x, long y, long width, long height ); virtual bool IsExposed( long x, long y, long width, long height );
@@ -152,9 +152,9 @@ public:
virtual int GetCharHeight(void) const; virtual int GetCharHeight(void) const;
virtual int GetCharWidth(void) const; virtual int GetCharWidth(void) const;
virtual void GetTextExtent( const wxString& string, int *x, int *y, virtual void GetTextExtent( const wxString& string, int *x, int *y,
int *descent = NULL, int *descent = (int *) NULL,
int *externalLeading = NULL, int *externalLeading = (int *) NULL,
const wxFont *theFont = NULL, bool use16 = FALSE) const; const wxFont *theFont = (const wxFont *) NULL, bool use16 = FALSE) const;
virtual void SetDefaultBackgroundColour( const wxColour& col ) virtual void SetDefaultBackgroundColour( const wxColour& col )
{ m_defaultBackgroundColour = col; } { m_defaultBackgroundColour = col; }
@@ -219,7 +219,7 @@ public:
virtual int GetScrollPos( int orient ) const; virtual int GetScrollPos( int orient ) const;
virtual int GetScrollThumb( int orient ) const; virtual int GetScrollThumb( int orient ) const;
virtual int GetScrollRange( int orient ) const; virtual int GetScrollRange( int orient ) const;
virtual void ScrollWindow( int dx, int dy, const wxRect* rect = NULL ); virtual void ScrollWindow( int dx, int dy, const wxRect* rect = (wxRect *) NULL );
// return FALSE from here if the window doesn't want the focus // return FALSE from here if the window doesn't want the focus
virtual bool AcceptsFocus() const; virtual bool AcceptsFocus() const;

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

@@ -110,7 +110,7 @@ class wxBitmap: public wxObject
void Resize( int height, int width ); void Resize( int height, int width );
bool SaveFile( const wxString &name, int type, wxPalette *palette = NULL ); bool SaveFile( const wxString &name, int type, wxPalette *palette = (wxPalette *) NULL );
bool LoadFile( const wxString &name, int type = wxBITMAP_TYPE_XPM); bool LoadFile( const wxString &name, int type = wxBITMAP_TYPE_XPM);
wxPalette *GetPalette() const; wxPalette *GetPalette() const;

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

@@ -47,7 +47,7 @@ class wxChoice: public wxControl
inline wxChoice( wxWindow *parent, wxWindowID id, inline wxChoice( wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
int n = 0, const wxString choices[] = NULL, int n = 0, const wxString choices[] = (const wxString *) NULL,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxChoiceNameStr ) const wxString& name = wxChoiceNameStr )
@@ -57,7 +57,7 @@ class wxChoice: public wxControl
bool Create( wxWindow *parent, wxWindowID id, bool Create( wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
int n = 0, const wxString choices[] = NULL, int n = 0, const wxString choices[] = (wxString *) NULL,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxChoiceNameStr ); const wxString& name = wxChoiceNameStr );

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

@@ -48,7 +48,7 @@ class wxComboBox: public wxControl
const wxString& value = wxEmptyString, const wxString& value = wxEmptyString,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
int n = 0, const wxString choices[] = NULL, int n = 0, const wxString choices[] = (const wxString *) NULL,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxComboBoxNameStr) const wxString& name = wxComboBoxNameStr)
@@ -59,7 +59,7 @@ class wxComboBox: public wxControl
const wxString& value = wxEmptyString, const wxString& value = wxEmptyString,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
int n = 0, const wxString choices[] = NULL, int n = 0, const wxString choices[] = (const wxString *) NULL,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxComboBoxNameStr); const wxString& name = wxComboBoxNameStr);

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

@@ -105,8 +105,8 @@ class wxDC: public wxObject
virtual void DrawText( const wxString &text, long x, long y, bool use16 = FALSE ) = 0; virtual void DrawText( const wxString &text, long x, long y, bool use16 = FALSE ) = 0;
virtual bool CanGetTextExtent(void) const = 0; virtual bool CanGetTextExtent(void) const = 0;
virtual void GetTextExtent( const wxString &string, long *width, long *height, virtual void GetTextExtent( const wxString &string, long *width, long *height,
long *descent = NULL, long *externalLeading = NULL, long *descent = (long *) NULL, long *externalLeading = (long *) NULL,
wxFont *theFont = NULL, bool use16 = FALSE ) = 0; wxFont *theFont = (wxFont *) NULL, bool use16 = FALSE ) = 0;
virtual long GetCharWidth(void) = 0; virtual long GetCharWidth(void) = 0;
virtual long GetCharHeight(void) = 0; virtual long GetCharHeight(void) = 0;

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

@@ -70,8 +70,8 @@ class wxPaintDC: public wxDC
virtual void DrawText( const wxString &text, long x, long y, bool use16 = FALSE ); virtual void DrawText( const wxString &text, long x, long y, bool use16 = FALSE );
virtual bool CanGetTextExtent(void) const; virtual bool CanGetTextExtent(void) const;
virtual void GetTextExtent( const wxString &string, long *width, long *height, virtual void GetTextExtent( const wxString &string, long *width, long *height,
long *descent = NULL, long *externalLeading = NULL, long *descent = (long *) NULL, long *externalLeading = (long *) NULL,
wxFont *theFont = NULL, bool use16 = FALSE ); wxFont *theFont = (wxFont *) NULL, bool use16 = FALSE );
virtual long GetCharWidth(void); virtual long GetCharWidth(void);
virtual long GetCharHeight(void); virtual long GetCharHeight(void);

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

@@ -23,7 +23,7 @@ class WXDLLEXPORT wxScreenDC: public wxPaintDC
~wxScreenDC(void); ~wxScreenDC(void);
static bool StartDrawingOnTop( wxWindow *window ); static bool StartDrawingOnTop( wxWindow *window );
static bool StartDrawingOnTop( wxRectangle *rect = NULL ); static bool StartDrawingOnTop( wxRectangle *rect = (wxRectangle *) NULL );
static bool EndDrawingOnTop(void); static bool EndDrawingOnTop(void);
}; };

14
include/wx/gtk1/filedlg.h
View File

@@ -79,16 +79,16 @@ class wxFileDialog: public wxDialog
// File selector - backward compatibility // File selector - backward compatibility
char* wxFileSelector(const char *message = wxFileSelectorPromptStr, const char *default_path = NULL, char* wxFileSelector(const char *message = wxFileSelectorPromptStr, const char *default_path = (const char *) NULL,
const char *default_filename = NULL, const char *default_extension = NULL, const char *default_filename = (const char *) NULL, const char *default_extension = (const char *) NULL,
const char *wildcard = wxFileSelectorDefaultWildcardStr, int flags = 0, const char *wildcard = wxFileSelectorDefaultWildcardStr, int flags = 0,
wxWindow *parent = NULL, int x = -1, int y = -1); wxWindow *parent = (wxWindow *) NULL, int x = -1, int y = -1);
char* wxLoadFileSelector(const char *what, const char *extension, const char *default_name = NULL, char* wxLoadFileSelector(const char *what, const char *extension, const char *default_name = (const char *) NULL,
wxWindow *parent = NULL); wxWindow *parent = (wxWindow *) NULL);
char* wxSaveFileSelector(const char *what, const char *extension, const char *default_name = NULL, char* wxSaveFileSelector(const char *what, const char *extension, const char *default_name = (const char *) NULL,
wxWindow *parent = NULL); wxWindow *parent = (wxWindow *) NULL);

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

@@ -50,7 +50,7 @@ class wxFont: public wxGDIObject
public: public:
wxFont(void); wxFont(void);
wxFont( int PointSize, int FontIdOrFamily, int Style, int Weight, wxFont( int PointSize, int FontIdOrFamily, int Style, int Weight,
bool underlined = FALSE, const char *Face=NULL ); bool underlined = FALSE, const char *Face= ( const char *) NULL );
wxFont( int PointSize, const char *Face, int Family, int Style, int Weight, wxFont( int PointSize, const char *Face, int Family, int Style, int Weight,
bool underlined = FALSE ); bool underlined = FALSE );
wxFont( const wxFont& font ); wxFont( const wxFont& font );

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

@@ -48,7 +48,7 @@ class wxListBox: public wxControl
inline wxListBox( wxWindow *parent, wxWindowID id, inline wxListBox( wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
int n = 0, const wxString choices[] = NULL, int n = 0, const wxString choices[] = (const wxString *) NULL,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxListBoxNameStr ) const wxString& name = wxListBoxNameStr )
@@ -58,7 +58,7 @@ class wxListBox: public wxControl
bool Create( wxWindow *parent, wxWindowID id, bool Create( wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
int n = 0, const wxString choices[] = NULL, int n = 0, const wxString choices[] = (const wxString *) NULL,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxListBoxNameStr ); const wxString& name = wxListBoxNameStr );

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

@@ -126,8 +126,8 @@ class wxMDIChildFrame: public wxFrame
virtual void Activate(void); virtual void Activate(void);
// no status bars // no status bars
virtual wxStatusBar* CreateStatusBar( int WXUNUSED(number), long WXUNUSED(style), virtual wxStatusBar* CreateStatusBar( int WXUNUSED(number)=1, long WXUNUSED(style)=1,
wxWindowID WXUNUSED(id), const wxString& WXUNUSED(name) ) {return (wxStatusBar*)NULL; } wxWindowID WXUNUSED(id)=1, const wxString& WXUNUSED(name)=WXSTRINGCAST NULL ) {return (wxStatusBar*)NULL; }
virtual wxStatusBar *GetStatusBar() { return (wxStatusBar*)NULL; } virtual wxStatusBar *GetStatusBar() { return (wxStatusBar*)NULL; }
virtual void SetStatusText( const wxString &WXUNUSED(text), int WXUNUSED(number) ) {} virtual void SetStatusText( const wxString &WXUNUSED(text), int WXUNUSED(number) ) {}
virtual void SetStatusWidths( int WXUNUSED(n), int *WXUNUSED(width) ) {} virtual void SetStatusWidths( int WXUNUSED(n), int *WXUNUSED(width) ) {}

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

@@ -124,7 +124,7 @@ DECLARE_DYNAMIC_CLASS(wxMenu)
public: public:
// construction // construction
wxMenu( const wxString& title = wxEmptyString, const wxFunction func = NULL ); wxMenu( const wxString& title = wxEmptyString, const wxFunction func = (wxFunction) NULL );
// operations // operations
// title // title

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

@@ -48,7 +48,7 @@ class wxRadioBox: public wxControl
wxRadioBox(void); wxRadioBox(void);
inline wxRadioBox( wxWindow *parent, wxWindowID id, const wxString& title, inline wxRadioBox( wxWindow *parent, wxWindowID id, const wxString& title,
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
int n = 0, const wxString choices[] = NULL, int n = 0, const wxString choices[] = (const wxString *) NULL,
int majorDim = 0, long style = wxRA_HORIZONTAL, int majorDim = 0, long style = wxRA_HORIZONTAL,
const wxValidator& val = wxDefaultValidator, const wxValidator& val = wxDefaultValidator,
const wxString& name = wxRadioBoxNameStr ) const wxString& name = wxRadioBoxNameStr )
@@ -57,7 +57,7 @@ class wxRadioBox: public wxControl
} }
bool Create( wxWindow *parent, wxWindowID id, const wxString& title, bool Create( wxWindow *parent, wxWindowID id, const wxString& title,
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
int n = 0, const wxString choices[] = NULL, int n = 0, const wxString choices[] = (const wxString *) NULL,
int majorDim = 0, long style = wxRA_HORIZONTAL, int majorDim = 0, long style = wxRA_HORIZONTAL,
const wxValidator& val = wxDefaultValidator, const wxValidator& val = wxDefaultValidator,
const wxString& name = wxRadioBoxNameStr ); const wxString& name = wxRadioBoxNameStr );

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

@@ -42,7 +42,7 @@ class wxScrollBar: public wxControl
public: public:
wxScrollBar(void) { m_adjust = NULL; m_oldPos = 0.0; }; wxScrollBar(void) { m_adjust = (GtkAdjustment *) NULL; m_oldPos = 0.0; };
inline wxScrollBar( wxWindow *parent, wxWindowID id, inline wxScrollBar( wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,

6
include/wx/gtk1/tbargtk.h
View File

@@ -52,9 +52,9 @@ class wxToolBarTool: public wxObject
wxToolBarTool(void) {}; wxToolBarTool(void) {};
wxToolBarTool( wxToolBar *owner, int theIndex = 0, wxToolBarTool( wxToolBar *owner, int theIndex = 0,
const wxBitmap& bitmap1 = wxNullBitmap, const wxBitmap& bitmap2 = wxNullBitmap, const wxBitmap& bitmap1 = wxNullBitmap, const wxBitmap& bitmap2 = wxNullBitmap,
bool toggle = FALSE, wxObject *clientData = NULL, bool toggle = FALSE, wxObject *clientData = (wxObject *) NULL,
const wxString& shortHelpString = "", const wxString& longHelpString = "", const wxString& shortHelpString = "", const wxString& longHelpString = "",
GtkWidget *item = NULL ); GtkWidget *item = (GtkWidget *) NULL );
~wxToolBarTool(void); ~wxToolBarTool(void);
public: public:
@@ -110,7 +110,7 @@ class wxToolBar: public wxControl
// If toggle is TRUE, the button toggles between the two states. // If toggle is TRUE, the button toggles between the two states.
virtual wxToolBarTool *AddTool( int toolIndex, const wxBitmap& bitmap, virtual wxToolBarTool *AddTool( int toolIndex, const wxBitmap& bitmap,
const wxBitmap& pushedBitmap = wxNullBitmap, bool toggle = FALSE, const wxBitmap& pushedBitmap = wxNullBitmap, bool toggle = FALSE,
float xPos = -1, float yPos = -1, wxObject *clientData = NULL, float xPos = -1, float yPos = -1, wxObject *clientData = (wxObject *)NULL,
const wxString& helpString1 = "", const wxString& helpString2 = ""); const wxString& helpString1 = "", const wxString& helpString2 = "");
virtual void AddSeparator(void); virtual void AddSeparator(void);
virtual void ClearTools(void); virtual void ClearTools(void);

28
include/wx/gtk1/treectrl.h
View File

@@ -315,20 +315,20 @@ class WXDLLEXPORT wxTreeEvent: public wxCommandEvent
typedef void (wxEvtHandler::*wxTreeEventFunction)(wxTreeEvent&); typedef void (wxEvtHandler::*wxTreeEventFunction)(wxTreeEvent&);
#define EVT_TREE_BEGIN_DRAG(id, fn) { wxEVT_COMMAND_TREE_BEGIN_DRAG, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, #define EVT_TREE_BEGIN_DRAG(id, fn) { wxEVT_COMMAND_TREE_BEGIN_DRAG, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL },
#define EVT_TREE_BEGIN_RDRAG(id, fn) { wxEVT_COMMAND_TREE_BEGIN_RDRAG, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, #define EVT_TREE_BEGIN_RDRAG(id, fn) { wxEVT_COMMAND_TREE_BEGIN_RDRAG, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL },
#define EVT_TREE_BEGIN_LABEL_EDIT(id, fn) { wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn , NULL }, #define EVT_TREE_BEGIN_LABEL_EDIT(id, fn) { wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn , (wxObject *) NULL },
#define EVT_TREE_END_LABEL_EDIT(id, fn) { wxEVT_COMMAND_TREE_END_LABEL_EDIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, #define EVT_TREE_END_LABEL_EDIT(id, fn) { wxEVT_COMMAND_TREE_END_LABEL_EDIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL },
#define EVT_TREE_DELETE_ITEM(id, fn) { wxEVT_COMMAND_TREE_DELETE_ITEM, id, -1, ( wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, #define EVT_TREE_DELETE_ITEM(id, fn) { wxEVT_COMMAND_TREE_DELETE_ITEM, id, -1, ( wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL },
#define EVT_TREE_GET_INFO(id, fn) { wxEVT_COMMAND_TREE_GET_INFO, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, #define EVT_TREE_GET_INFO(id, fn) { wxEVT_COMMAND_TREE_GET_INFO, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL },
#define EVT_TREE_SET_INFO(id, fn) { wxEVT_COMMAND_TREE_SET_INFO, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, #define EVT_TREE_SET_INFO(id, fn) { wxEVT_COMMAND_TREE_SET_INFO, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL },
#define EVT_TREE_ITEM_EXPANDED(id, fn) { wxEVT_COMMAND_TREE_ITEM_EXPANDED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, #define EVT_TREE_ITEM_EXPANDED(id, fn) { wxEVT_COMMAND_TREE_ITEM_EXPANDED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL },
#define EVT_TREE_ITEM_EXPANDING(id, fn) { wxEVT_COMMAND_TREE_ITEM_EXPANDING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, #define EVT_TREE_ITEM_EXPANDING(id, fn) { wxEVT_COMMAND_TREE_ITEM_EXPANDING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL },
#define EVT_TREE_ITEM_COLLAPSED(id, fn) { wxEVT_COMMAND_TREE_ITEM_COLLAPSED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, #define EVT_TREE_ITEM_COLLAPSED(id, fn) { wxEVT_COMMAND_TREE_ITEM_COLLAPSED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL },
#define EVT_TREE_ITEM_COLLAPSING(id, fn) { wxEVT_COMMAND_TREE_ITEM_COLLAPSING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, #define EVT_TREE_ITEM_COLLAPSING(id, fn) { wxEVT_COMMAND_TREE_ITEM_COLLAPSING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL },
#define EVT_TREE_SEL_CHANGED(id, fn) { wxEVT_COMMAND_TREE_SEL_CHANGED, id, -1, ( wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, #define EVT_TREE_SEL_CHANGED(id, fn) { wxEVT_COMMAND_TREE_SEL_CHANGED, id, -1, ( wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL },
#define EVT_TREE_SEL_CHANGING(id, fn) { wxEVT_COMMAND_TREE_SEL_CHANGING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, #define EVT_TREE_SEL_CHANGING(id, fn) { wxEVT_COMMAND_TREE_SEL_CHANGING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL },
#define EVT_TREE_KEY_DOWN(id, fn) { wxEVT_COMMAND_TREE_KEY_DOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, #define EVT_TREE_KEY_DOWN(id, fn) { wxEVT_COMMAND_TREE_KEY_DOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL },
#endif #endif
// __GTKTREECTRL_H__ // __GTKTREECTRL_H__

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

@@ -1,4 +1,4 @@
///////////////////////////////////////////////////////////////////////////// /* ///////////////////////////////////////////////////////////////////////////
// Name: win_gtk.h // Name: win_gtk.h
// Purpose: wxWindows's GTK base widget // Purpose: wxWindows's GTK base widget
// Author: Robert Roebling // Author: Robert Roebling
@@ -6,7 +6,7 @@
// Id: // Id:
// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem // Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////// */
#ifndef __GTK_MYFIXED_H__ #ifndef __GTK_MYFIXED_H__

14
include/wx/gtk1/window.h
View File

@@ -77,8 +77,8 @@ public:
const wxString& name = wxPanelNameStr); const wxString& name = wxPanelNameStr);
virtual ~wxWindow(); virtual ~wxWindow();
virtual bool LoadFromResource(wxWindow *parent, const wxString& resourceName, const wxResourceTable *table = NULL); virtual bool LoadFromResource(wxWindow *parent, const wxString& resourceName, const wxResourceTable *table = (const wxResourceTable *) NULL);
virtual wxControl *CreateItem(const wxItemResource *childResource, const wxResourceTable *table = NULL); virtual wxControl *CreateItem(const wxItemResource *childResource, const wxResourceTable *table = (const wxResourceTable *) NULL);
bool Close( bool force = FALSE ); bool Close( bool force = FALSE );
virtual bool Destroy(); virtual bool Destroy();
@@ -139,7 +139,7 @@ public:
void SetCursor( const wxCursor &cursor ); void SetCursor( const wxCursor &cursor );
virtual void Refresh( bool eraseBackground = TRUE, const wxRect *rect = NULL ); virtual void Refresh( bool eraseBackground = TRUE, const wxRect *rect = (const wxRect *) NULL );
virtual void Clear(); virtual void Clear();
virtual bool IsExposed( long x, long y ); virtual bool IsExposed( long x, long y );
virtual bool IsExposed( long x, long y, long width, long height ); virtual bool IsExposed( long x, long y, long width, long height );
@@ -152,9 +152,9 @@ public:
virtual int GetCharHeight(void) const; virtual int GetCharHeight(void) const;
virtual int GetCharWidth(void) const; virtual int GetCharWidth(void) const;
virtual void GetTextExtent( const wxString& string, int *x, int *y, virtual void GetTextExtent( const wxString& string, int *x, int *y,
int *descent = NULL, int *descent = (int *) NULL,
int *externalLeading = NULL, int *externalLeading = (int *) NULL,
const wxFont *theFont = NULL, bool use16 = FALSE) const; const wxFont *theFont = (const wxFont *) NULL, bool use16 = FALSE) const;
virtual void SetDefaultBackgroundColour( const wxColour& col ) virtual void SetDefaultBackgroundColour( const wxColour& col )
{ m_defaultBackgroundColour = col; } { m_defaultBackgroundColour = col; }
@@ -219,7 +219,7 @@ public:
virtual int GetScrollPos( int orient ) const; virtual int GetScrollPos( int orient ) const;
virtual int GetScrollThumb( int orient ) const; virtual int GetScrollThumb( int orient ) const;
virtual int GetScrollRange( int orient ) const; virtual int GetScrollRange( int orient ) const;
virtual void ScrollWindow( int dx, int dy, const wxRect* rect = NULL ); virtual void ScrollWindow( int dx, int dy, const wxRect* rect = (wxRect *) NULL );
// return FALSE from here if the window doesn't want the focus // return FALSE from here if the window doesn't want the focus
virtual bool AcceptsFocus() const; virtual bool AcceptsFocus() const;

12
include/wx/intl.h
View File

@@ -61,14 +61,14 @@ public:
wxLocale(); wxLocale();
// the ctor has a side effect of changing current locale // the ctor has a side effect of changing current locale
wxLocale(const char *szName, // name (for messages) wxLocale(const char *szName, // name (for messages)
const char *szShort = NULL, // dir prefix (for msg files) const char *szShort = (const char *) NULL, // dir prefix (for msg files)
const char *szLocale = NULL, // locale (for setlocale) const char *szLocale = (const char *) NULL, // locale (for setlocale)
bool bLoadDefault = TRUE) // preload wxstd.mo? bool bLoadDefault = TRUE) // preload wxstd.mo?
{ Init(szName, szShort, szLocale, bLoadDefault); } { Init(szName, szShort, szLocale, bLoadDefault); }
// the same as a function (returns TRUE on success) // the same as a function (returns TRUE on success)
bool Init(const char *szName, bool Init(const char *szName,
const char *szShort = NULL, const char *szShort = (const char *) NULL,
const char *szLocale = NULL, const char *szLocale = (const char *) NULL,
bool bLoadDefault = TRUE); bool bLoadDefault = TRUE);
// restores old locale // restores old locale
~wxLocale(); ~wxLocale();
@@ -97,7 +97,7 @@ public:
// domains are searched in the last to first order, i.e. catalogs // domains are searched in the last to first order, i.e. catalogs
// added later override those added before. // added later override those added before.
const char *GetString(const char *szOrigString, const char *GetString(const char *szOrigString,
const char *szDomain = NULL) const; const char *szDomain = (const char *) NULL) const;
private: private:
// find catalog by name in a linked list, return NULL if !found // find catalog by name in a linked list, return NULL if !found
@@ -121,7 +121,7 @@ WXDLLEXPORT wxLocale* wxGetLocale();
inline WXDLLEXPORT const char *wxGetTranslation(const char *sz) inline WXDLLEXPORT const char *wxGetTranslation(const char *sz)
{ {
wxLocale *pLoc = wxGetLocale(); wxLocale *pLoc = wxGetLocale();
return pLoc == NULL ? sz : pLoc->GetString(sz); return pLoc == (wxLocale *) NULL ? sz : pLoc->GetString(sz);
} }
#endif #endif

4
include/wx/ipcbase.h
View File

@@ -33,7 +33,7 @@ class WXDLLEXPORT wxConnectionBase: public wxObject
// Calls that CLIENT can make // Calls that CLIENT can make
virtual bool Execute(char *data, int size = -1, wxDataFormat format = wxDF_TEXT ) = 0; virtual bool Execute(char *data, int size = -1, wxDataFormat format = wxDF_TEXT ) = 0;
virtual bool Execute(const wxString& str) { return Execute((char *)(const char *)str, -1, wxDF_TEXT); } virtual bool Execute(const wxString& str) { return Execute((char *)(const char *)str, -1, wxDF_TEXT); }
virtual char *Request(const wxString& item, int *size = NULL, wxDataFormat format = wxDF_TEXT) = 0; virtual char *Request(const wxString& item, int *size = (int *) NULL, wxDataFormat format = wxDF_TEXT) = 0;
virtual bool Poke(const wxString& item, char *data, int size = -1, wxDataFormat format = wxDF_TEXT) = 0; virtual bool Poke(const wxString& item, char *data, int size = -1, wxDataFormat format = wxDF_TEXT) = 0;
virtual bool StartAdvise(const wxString& item) = 0; virtual bool StartAdvise(const wxString& item) = 0;
virtual bool StopAdvise(const wxString& item) = 0; virtual bool StopAdvise(const wxString& item) = 0;
@@ -48,7 +48,7 @@ class WXDLLEXPORT wxConnectionBase: public wxObject
virtual bool OnExecute( const wxString& WXUNUSED(topic), char *WXUNUSED(data), int WXUNUSED(size), virtual bool OnExecute( const wxString& WXUNUSED(topic), char *WXUNUSED(data), int WXUNUSED(size),
int WXUNUSED(format) ) { return FALSE; }; int WXUNUSED(format) ) { return FALSE; };
virtual char *OnRequest( const wxString& WXUNUSED(topic), const wxString& WXUNUSED(item), virtual char *OnRequest( const wxString& WXUNUSED(topic), const wxString& WXUNUSED(item),
int *WXUNUSED(size), int WXUNUSED(format) ) { return NULL; }; int *WXUNUSED(size), int WXUNUSED(format) ) { return (char *) NULL; };
virtual bool OnPoke( const wxString& WXUNUSED(topic), const wxString& WXUNUSED(item), char *WXUNUSED(data), virtual bool OnPoke( const wxString& WXUNUSED(topic), const wxString& WXUNUSED(item), char *WXUNUSED(data),
int WXUNUSED(size), int WXUNUSED(format) ) { return FALSE; }; int WXUNUSED(size), int WXUNUSED(format) ) { return FALSE; };
virtual bool OnStartAdvise( const wxString& WXUNUSED(topic), const wxString& WXUNUSED(item) ) virtual bool OnStartAdvise( const wxString& WXUNUSED(topic), const wxString& WXUNUSED(item) )

2
include/wx/list.h
View File

@@ -43,7 +43,7 @@ class WXDLLEXPORT wxNode: public wxObject
char *string; char *string;
} key; } key;
wxNode(wxList *the_list = NULL, wxNode *last_one = NULL, wxNode *next_one = NULL, wxObject *object = NULL); wxNode(wxList *the_list = (wxList *) NULL, wxNode *last_one = (wxNode *) NULL, wxNode *next_one = (wxNode *) NULL, wxObject *object = (wxObject *) NULL);
wxNode(wxList *the_list, wxNode *last_one, wxNode *next_one, wxNode(wxList *the_list, wxNode *last_one, wxNode *next_one,
wxObject *object, long the_key); wxObject *object, long the_key);
wxNode(wxList *the_list, wxNode *last_one, wxNode *next_one, wxNode(wxList *the_list, wxNode *last_one, wxNode *next_one,

6
include/wx/log.h
View File

@@ -149,7 +149,7 @@ class WXDLLEXPORT wxLogStderr : public wxLog
{ {
public: public:
// redirect log output to a FILE // redirect log output to a FILE
wxLogStderr(FILE *fp = NULL); wxLogStderr(FILE *fp = (FILE *) NULL);
private: private:
// implement sink function // implement sink function
@@ -164,7 +164,7 @@ class WXDLLEXPORT wxLogStream : public wxLog
{ {
public: public:
// redirect log output to an ostream // redirect log output to an ostream
wxLogStream(ostream *ostr = NULL); wxLogStream(ostream *ostr = (ostream *) NULL);
protected: protected:
// implement sink function // implement sink function
@@ -276,7 +276,7 @@ class WXDLLEXPORT wxLogNull
{ {
public: public:
// ctor saves old log target, dtor restores it // ctor saves old log target, dtor restores it
wxLogNull() { m_pPrevLogger = wxLog::SetActiveTarget(NULL); } wxLogNull() { m_pPrevLogger = wxLog::SetActiveTarget((wxLog *) NULL); }
~wxLogNull() { (void)wxLog::SetActiveTarget(m_pPrevLogger); } ~wxLogNull() { (void)wxLog::SetActiveTarget(m_pPrevLogger); }
private: private:

20
include/wx/msw/treectrl.h
View File

@@ -279,16 +279,16 @@ class WXDLLEXPORT wxTreeEvent: public wxCommandEvent
typedef void (wxEvtHandler::*wxTreeEventFunction)(wxTreeEvent&); typedef void (wxEvtHandler::*wxTreeEventFunction)(wxTreeEvent&);
#define EVT_TREE_BEGIN_DRAG(id, fn) { wxEVT_COMMAND_TREE_BEGIN_DRAG, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, #define EVT_TREE_BEGIN_DRAG(id, fn) { wxEVT_COMMAND_TREE_BEGIN_DRAG, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL },
#define EVT_TREE_BEGIN_RDRAG(id, fn) { wxEVT_COMMAND_TREE_BEGIN_RDRAG, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, #define EVT_TREE_BEGIN_RDRAG(id, fn) { wxEVT_COMMAND_TREE_BEGIN_RDRAG, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL },
#define EVT_TREE_BEGIN_LABEL_EDIT(id, fn) { wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, #define EVT_TREE_BEGIN_LABEL_EDIT(id, fn) { wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL },
#define EVT_TREE_END_LABEL_EDIT(id, fn) { wxEVT_COMMAND_TREE_END_LABEL_EDIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, #define EVT_TREE_END_LABEL_EDIT(id, fn) { wxEVT_COMMAND_TREE_END_LABEL_EDIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL },
#define EVT_TREE_DELETE_ITEM(id, fn) { wxEVT_COMMAND_TREE_DELETE_ITEM, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, #define EVT_TREE_DELETE_ITEM(id, fn) { wxEVT_COMMAND_TREE_DELETE_ITEM, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL },
#define EVT_TREE_GET_INFO(id, fn) { wxEVT_COMMAND_TREE_GET_INFO, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, #define EVT_TREE_GET_INFO(id, fn) { wxEVT_COMMAND_TREE_GET_INFO, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL },
#define EVT_TREE_SET_INFO(id, fn) { wxEVT_COMMAND_TREE_SET_INFO, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, #define EVT_TREE_SET_INFO(id, fn) { wxEVT_COMMAND_TREE_SET_INFO, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL },
#define EVT_TREE_ITEM_EXPANDED(id, fn) { wxEVT_COMMAND_TREE_ITEM_EXPANDED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, #define EVT_TREE_ITEM_EXPANDED(id, fn) { wxEVT_COMMAND_TREE_ITEM_EXPANDED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL },
#define EVT_TREE_ITEM_EXPANDING(id, fn) { wxEVT_COMMAND_TREE_ITEM_EXPANDING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, #define EVT_TREE_ITEM_EXPANDING(id, fn) { wxEVT_COMMAND_TREE_ITEM_EXPANDING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL },
#define EVT_TREE_ITEM_COLLAPSED(id, fn) { wxEVT_COMMAND_TREE_ITEM_COLLAPSED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, #define EVT_TREE_ITEM_COLLAPSED(id, fn) { wxEVT_COMMAND_TREE_ITEM_COLLAPSED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL },
#define EVT_TREE_ITEM_COLLAPSING(id, fn) { wxEVT_COMMAND_TREE_ITEM_COLLAPSING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, #define EVT_TREE_ITEM_COLLAPSING(id, fn) { wxEVT_COMMAND_TREE_ITEM_COLLAPSING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
#define EVT_TREE_SEL_CHANGED(id, fn) { wxEVT_COMMAND_TREE_SEL_CHANGED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, #define EVT_TREE_SEL_CHANGED(id, fn) { wxEVT_COMMAND_TREE_SEL_CHANGED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
#define EVT_TREE_SEL_CHANGING(id, fn) { wxEVT_COMMAND_TREE_SEL_CHANGING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, #define EVT_TREE_SEL_CHANGING(id, fn) { wxEVT_COMMAND_TREE_SEL_CHANGING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },

9
include/wx/object.h
View File

@@ -95,13 +95,13 @@ wxObject* WXDLLEXPORT wxCreateStoredObject( wxInputStream& stream );
#define IMPLEMENT_DYNAMIC_CLASS(name, basename) \ #define IMPLEMENT_DYNAMIC_CLASS(name, basename) \
wxObject* WXDLLEXPORT_CTORFN wxConstructorFor##name(void) \ wxObject* WXDLLEXPORT_CTORFN wxConstructorFor##name(void) \
{ return new name; }\ { return new name; }\
wxClassInfo name::class##name(#name, #basename, NULL, sizeof(name), wxConstructorFor##name); wxClassInfo name::class##name((char *) #name, (char *) #basename, (char *) NULL, (int) sizeof(name), (wxObjectConstructorFn) wxConstructorFor##name);
// Multiple inheritance with two base classes // Multiple inheritance with two base classes
#define IMPLEMENT_DYNAMIC_CLASS2(name, basename1, basename2) \ #define IMPLEMENT_DYNAMIC_CLASS2(name, basename1, basename2) \
wxObject* WXDLLEXPORT_CTORFN wxConstructorFor##name(void) \ wxObject* WXDLLEXPORT_CTORFN wxConstructorFor##name(void) \
{ return new name; }\ { return new name; }\
wxClassInfo name::class##name(#name, #basename1, #basename2, sizeof(name), wxConstructorFor##name); wxClassInfo name::class##name((char *) #name, (char *) #basename1, (char *) #basename2, (int) sizeof(name), (wxObjectConstructorFn) wxConstructorFor##name);
////// //////
////// for abstract classes ////// for abstract classes
@@ -109,11 +109,12 @@ wxObject* WXDLLEXPORT_CTORFN wxConstructorFor##name(void) \
// Single inheritance with one base class // Single inheritance with one base class
#define IMPLEMENT_ABSTRACT_CLASS(name, basename) \ #define IMPLEMENT_ABSTRACT_CLASS(name, basename) \
wxClassInfo name::class##name(#name, #basename, NULL, sizeof(name), NULL); wxClassInfo name::class##name((char *) #name, (char *) #basename, \
(char *) NULL, (int) sizeof(name), (wxObjectConstructorFn) NULL);
// Multiple inheritance with two base classes // Multiple inheritance with two base classes
#define IMPLEMENT_ABSTRACT_CLASS2(name, basename1, basename2) \ #define IMPLEMENT_ABSTRACT_CLASS2(name, basename1, basename2) \
wxClassInfo name::class##name(#name, #basename1, #basename2, sizeof(name), NULL); wxClassInfo name::class##name((char *) #name, (char *) #basename1, (char *) #basename2, (int) sizeof(name), (wxObjectConstructorFn) NULL);
#define IMPLEMENT_CLASS IMPLEMENT_ABSTRACT_CLASS #define IMPLEMENT_CLASS IMPLEMENT_ABSTRACT_CLASS
#define IMPLEMENT_CLASS2 IMPLEMENT_ABSTRACT_CLASS2 #define IMPLEMENT_CLASS2 IMPLEMENT_ABSTRACT_CLASS2

13
include/wx/postscrp.h
View File

@@ -29,13 +29,13 @@ class WXDLLEXPORT wxPostScriptDC: public wxDC
public: public:
// Create a printer DC // Create a printer DC
wxPostScriptDC(void); wxPostScriptDC(void);
wxPostScriptDC(const wxString& output, bool interactive = TRUE, wxWindow *parent = NULL); wxPostScriptDC(const wxString& output, bool interactive = TRUE, wxWindow *parent = (wxWindow *) NULL);
~wxPostScriptDC(void); ~wxPostScriptDC(void);
bool Create(const wxString& output, bool interactive = TRUE, wxWindow *parent = NULL); bool Create(const wxString& output, bool interactive = TRUE, wxWindow *parent = (wxWindow *) NULL);
virtual bool PrinterDialog(wxWindow *parent = NULL); virtual bool PrinterDialog(wxWindow *parent = (wxWindow *) NULL);
inline virtual void BeginDrawing(void) {} ; inline virtual void BeginDrawing(void) {} ;
inline virtual void EndDrawing(void) {} ; inline virtual void EndDrawing(void) {} ;
@@ -99,8 +99,9 @@ class WXDLLEXPORT wxPostScriptDC: public wxDC
long GetCharHeight(void); long GetCharHeight(void);
long GetCharWidth(void); long GetCharWidth(void);
void GetTextExtent(const wxString& string, long *x, long *y, void GetTextExtent(const wxString& string, long *x, long *y,
long *descent = NULL, long *externalLeading = NULL, long *descent = (long *) NULL,
wxFont *theFont = NULL, bool use16 = FALSE); long *externalLeading = (long *) NULL,
wxFont *theFont = (wxFont *) NULL, bool use16 = FALSE);
virtual void SetLogicalOrigin(long x, long y); virtual void SetLogicalOrigin(long x, long y);
virtual void CalcBoundingBox(long x, long y); virtual void CalcBoundingBox(long x, long y);
@@ -272,7 +273,7 @@ class WXDLLEXPORT wxPrintPaperType: public wxObject
int heightPixels; int heightPixels;
char *pageName; char *pageName;
wxPrintPaperType(const char *name = NULL, int wmm = 0, int hmm = 0, int wp = 0, int hp = 0); wxPrintPaperType(const char *name = (const char *) NULL, int wmm = 0, int hmm = 0, int wp = 0, int hp = 0);
~wxPrintPaperType(void); ~wxPrintPaperType(void);
}; };

4
include/wx/prntbase.h
View File

@@ -50,7 +50,7 @@ class WXDLLEXPORT wxPrinterBase: public wxObject
static wxWindow *abortWindow; static wxWindow *abortWindow;
static bool abortIt; static bool abortIt;
wxPrinterBase(wxPrintData *data = NULL); wxPrinterBase(wxPrintData *data = (wxPrintData *) NULL);
~wxPrinterBase(void); ~wxPrinterBase(void);
virtual wxWindow *CreateAbortWindow(wxWindow *parent, wxPrintout *printout); virtual wxWindow *CreateAbortWindow(wxWindow *parent, wxPrintout *printout);
@@ -262,7 +262,7 @@ class WXDLLEXPORT wxPrintPreviewBase: public wxObject
protected: protected:
bool isOk; bool isOk;
public: public:
wxPrintPreviewBase(wxPrintout *printout, wxPrintout *printoutForPrinting = NULL, wxPrintData *data = NULL); wxPrintPreviewBase(wxPrintout *printout, wxPrintout *printoutForPrinting = (wxPrintout *) NULL, wxPrintData *data = (wxPrintData *) NULL);
~wxPrintPreviewBase(void); ~wxPrintPreviewBase(void);
virtual bool SetCurrentPage(int pageNum); virtual bool SetCurrentPage(int pageNum);

2
include/wx/process.h
View File

@@ -25,7 +25,7 @@ class WXDLLEXPORT wxProcess: public wxEvtHandler
DECLARE_DYNAMIC_CLASS(wxProcess) DECLARE_DYNAMIC_CLASS(wxProcess)
public: public:
wxProcess(wxEvtHandler *parent = NULL, int id = -1); wxProcess(wxEvtHandler *parent = (wxEvtHandler *) NULL, int id = -1);
virtual ~wxProcess(); virtual ~wxProcess();
virtual void OnTerminate(int pid); virtual void OnTerminate(int pid);

24
include/wx/resource.h
View File

@@ -149,25 +149,25 @@ class WXDLLEXPORT wxMenuBar;
class WXDLLEXPORT wxMenu; class WXDLLEXPORT wxMenu;
class WXDLLEXPORT wxBitmap; class WXDLLEXPORT wxBitmap;
class WXDLLEXPORT wxIcon; class WXDLLEXPORT wxIcon;
extern wxBitmap* WXDLLEXPORT wxResourceCreateBitmap(char *resource, wxResourceTable *table = NULL); extern wxBitmap* WXDLLEXPORT wxResourceCreateBitmap(char *resource, wxResourceTable *table = (wxResourceTable *) NULL);
extern wxIcon* WXDLLEXPORT wxResourceCreateIcon(char *resource, wxResourceTable *table = NULL); extern wxIcon* WXDLLEXPORT wxResourceCreateIcon(char *resource, wxResourceTable *table = (wxResourceTable *) NULL);
extern wxMenuBar* WXDLLEXPORT wxResourceCreateMenuBar(char *resource, wxResourceTable *table = NULL, wxMenuBar *menuBar = NULL); extern wxMenuBar* WXDLLEXPORT wxResourceCreateMenuBar(char *resource, wxResourceTable *table = (wxResourceTable *) NULL, wxMenuBar *menuBar = (wxMenuBar *) NULL);
extern wxMenu* WXDLLEXPORT wxResourceCreateMenu(char *resource, wxResourceTable *table = NULL); extern wxMenu* WXDLLEXPORT wxResourceCreateMenu(char *resource, wxResourceTable *table = (wxResourceTable *) NULL);
extern bool WXDLLEXPORT wxResourceParseData(char *resource, wxResourceTable *table = NULL); extern bool WXDLLEXPORT wxResourceParseData(char *resource, wxResourceTable *table = (wxResourceTable *) NULL);
extern bool WXDLLEXPORT wxResourceParseFile(char *filename, wxResourceTable *table = NULL); extern bool WXDLLEXPORT wxResourceParseFile(char *filename, wxResourceTable *table = (wxResourceTable *) NULL);
extern bool WXDLLEXPORT wxResourceParseString(char *s, wxResourceTable *table = NULL); extern bool WXDLLEXPORT wxResourceParseString(char *s, wxResourceTable *table = (wxResourceTable *) NULL);
extern void WXDLLEXPORT wxResourceClear(wxResourceTable *table = NULL); extern void WXDLLEXPORT wxResourceClear(wxResourceTable *table = (wxResourceTable *) NULL);
// Register XBM/XPM data // Register XBM/XPM data
extern bool WXDLLEXPORT wxResourceRegisterBitmapData(char *name, char bits[], int width, int height, wxResourceTable *table = NULL); extern bool WXDLLEXPORT wxResourceRegisterBitmapData(char *name, char bits[], int width, int height, wxResourceTable *table = (wxResourceTable *) NULL);
extern bool WXDLLEXPORT wxResourceRegisterBitmapData(char *name, char **data, wxResourceTable *table = NULL); extern bool WXDLLEXPORT wxResourceRegisterBitmapData(char *name, char **data, wxResourceTable *table = (wxResourceTable *) NULL);
#define wxResourceRegisterIconData wxResourceRegisterBitmapData #define wxResourceRegisterIconData wxResourceRegisterBitmapData
/* /*
* Resource identifer code: #define storage * Resource identifer code: #define storage
*/ */
extern bool WXDLLEXPORT wxResourceAddIdentifier(char *name, int value, wxResourceTable *table = NULL); extern bool WXDLLEXPORT wxResourceAddIdentifier(char *name, int value, wxResourceTable *table = (wxResourceTable *) NULL);
extern int WXDLLEXPORT wxResourceGetIdentifier(char *name, wxResourceTable *table = NULL); extern int WXDLLEXPORT wxResourceGetIdentifier(char *name, wxResourceTable *table = (wxResourceTable *) NULL);
#endif #endif
#endif #endif

4
include/wx/setup.h
View File

@@ -2,7 +2,7 @@
#ifndef _WX_SETUP_H_BASE_ #ifndef _WX_SETUP_H_BASE_
#define _WX_SETUP_H_BASE_ #define _WX_SETUP_H_BASE_
// compatibility code, to be removed asap: /* compatibility code, to be removed asap: */
#if !defined(__WXMSW__) && !defined(__WXGTK__) && !defined(__WXMOTIF__) && !defined(__WXQT__) && !defined(__WXSTUBS__) && !defined(__WXMAC__) #if !defined(__WXMSW__) && !defined(__WXGTK__) && !defined(__WXMOTIF__) && !defined(__WXQT__) && !defined(__WXSTUBS__) && !defined(__WXMAC__)
# error No __WXxxx__ define set! Please define one of __WXGTK__,__WXMSW__,__WXMOTIF__,__WXMAC__,__WXQT__,__WXSTUBS__ # error No __WXxxx__ define set! Please define one of __WXGTK__,__WXMSW__,__WXMOTIF__,__WXMAC__,__WXQT__,__WXSTUBS__
@@ -23,4 +23,4 @@
#endif #endif
#endif #endif
// _WX_SETUP_H_BASE_ /* _WX_SETUP_H_BASE_ */

28
include/wx/stubs/treectrl.h
View File

@@ -276,20 +276,20 @@ class WXDLLEXPORT wxTreeEvent: public wxCommandEvent
typedef void (wxEvtHandler::*wxTreeEventFunction)(wxTreeEvent&); typedef void (wxEvtHandler::*wxTreeEventFunction)(wxTreeEvent&);
#define EVT_TREE_BEGIN_DRAG(id, fn) { wxEVT_COMMAND_TREE_BEGIN_DRAG, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, #define EVT_TREE_BEGIN_DRAG(id, fn) { wxEVT_COMMAND_TREE_BEGIN_DRAG, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL },
#define EVT_TREE_BEGIN_RDRAG(id, fn) { wxEVT_COMMAND_TREE_BEGIN_RDRAG, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, #define EVT_TREE_BEGIN_RDRAG(id, fn) { wxEVT_COMMAND_TREE_BEGIN_RDRAG, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL },
#define EVT_TREE_BEGIN_LABEL_EDIT(id, fn) { wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, #define EVT_TREE_BEGIN_LABEL_EDIT(id, fn) { wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL },
#define EVT_TREE_END_LABEL_EDIT(id, fn) { wxEVT_COMMAND_TREE_END_LABEL_EDIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, #define EVT_TREE_END_LABEL_EDIT(id, fn) { wxEVT_COMMAND_TREE_END_LABEL_EDIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL },
#define EVT_TREE_DELETE_ITEM(id, fn) { wxEVT_COMMAND_TREE_DELETE_ITEM, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, #define EVT_TREE_DELETE_ITEM(id, fn) { wxEVT_COMMAND_TREE_DELETE_ITEM, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL },
#define EVT_TREE_GET_INFO(id, fn) { wxEVT_COMMAND_TREE_GET_INFO, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, #define EVT_TREE_GET_INFO(id, fn) { wxEVT_COMMAND_TREE_GET_INFO, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL },
#define EVT_TREE_SET_INFO(id, fn) { wxEVT_COMMAND_TREE_SET_INFO, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, #define EVT_TREE_SET_INFO(id, fn) { wxEVT_COMMAND_TREE_SET_INFO, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL },
#define EVT_TREE_ITEM_EXPANDED(id, fn) { wxEVT_COMMAND_TREE_ITEM_EXPANDED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, #define EVT_TREE_ITEM_EXPANDED(id, fn) { wxEVT_COMMAND_TREE_ITEM_EXPANDED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL },
#define EVT_TREE_ITEM_EXPANDING(id, fn) { wxEVT_COMMAND_TREE_ITEM_EXPANDING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, #define EVT_TREE_ITEM_EXPANDING(id, fn) { wxEVT_COMMAND_TREE_ITEM_EXPANDING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL },
#define EVT_TREE_ITEM_COLLAPSED(id, fn) { wxEVT_COMMAND_TREE_ITEM_COLLAPSED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, #define EVT_TREE_ITEM_COLLAPSED(id, fn) { wxEVT_COMMAND_TREE_ITEM_COLLAPSED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL },
#define EVT_TREE_ITEM_COLLAPSING(id, fn) { wxEVT_COMMAND_TREE_ITEM_COLLAPSING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, #define EVT_TREE_ITEM_COLLAPSING(id, fn) { wxEVT_COMMAND_TREE_ITEM_COLLAPSING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL },
#define EVT_TREE_SEL_CHANGED(id, fn) { wxEVT_COMMAND_TREE_SEL_CHANGED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, #define EVT_TREE_SEL_CHANGED(id, fn) { wxEVT_COMMAND_TREE_SEL_CHANGED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL },
#define EVT_TREE_SEL_CHANGING(id, fn) { wxEVT_COMMAND_TREE_SEL_CHANGING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, #define EVT_TREE_SEL_CHANGING(id, fn) { wxEVT_COMMAND_TREE_SEL_CHANGING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL },
#define EVT_TREE_KEY_DOWN(id, fn) { wxEVT_COMMAND_TREE_KEY_DOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL }, #define EVT_TREE_KEY_DOWN(id, fn) { wxEVT_COMMAND_TREE_KEY_DOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL },
#endif #endif
// _WX_TREECTRL_H_ // _WX_TREECTRL_H_

2
include/wx/textfile.h
View File

@@ -97,7 +97,7 @@ public:
default: default:
wxFAIL_MSG("bad file type in wxTextFile::GetEOL."); wxFAIL_MSG("bad file type in wxTextFile::GetEOL.");
return NULL; return (const char *) NULL;
} }
} }

12
include/wx/utils.h
View File

@@ -98,9 +98,9 @@ void WXDLLEXPORT wxDecToHex(int dec, char *buf);
// Execute another program. Returns 0 if there was an error, a PID otherwise. // Execute another program. Returns 0 if there was an error, a PID otherwise.
long WXDLLEXPORT wxExecute(char **argv, bool Async = FALSE, long WXDLLEXPORT wxExecute(char **argv, bool Async = FALSE,
wxProcess *process = NULL); wxProcess *process = (wxProcess *) NULL);
long WXDLLEXPORT wxExecute(const wxString& command, bool Async = FALSE, long WXDLLEXPORT wxExecute(const wxString& command, bool Async = FALSE,
wxProcess *process = NULL); wxProcess *process = (wxProcess *) NULL);
#define wxSIGTERM 1 #define wxSIGTERM 1
@@ -139,15 +139,15 @@ bool WXDLLEXPORT wxGetUserName(char *buf, int maxSize);
/* /*
* Strip out any menu codes * Strip out any menu codes
*/ */
char* WXDLLEXPORT wxStripMenuCodes(char *in, char *out = NULL); char* WXDLLEXPORT wxStripMenuCodes(char *in, char *out = (char *) NULL);
// Find the window/widget with the given title or label. // Find the window/widget with the given title or label.
// Pass a parent to begin the search from, or NULL to look through // Pass a parent to begin the search from, or NULL to look through
// all windows. // all windows.
wxWindow* WXDLLEXPORT wxFindWindowByLabel(const wxString& title, wxWindow *parent = NULL); wxWindow* WXDLLEXPORT wxFindWindowByLabel(const wxString& title, wxWindow *parent = (wxWindow *) NULL);
// Find window by name, and if that fails, by label. // Find window by name, and if that fails, by label.
wxWindow* WXDLLEXPORT wxFindWindowByName(const wxString& name, wxWindow *parent = NULL); wxWindow* WXDLLEXPORT wxFindWindowByName(const wxString& name, wxWindow *parent = (wxWindow *) NULL);
// Returns menu item id or -1 if none. // Returns menu item id or -1 if none.
int WXDLLEXPORT wxFindMenuItemId(wxFrame *frame, const wxString& menuString, const wxString& itemString); int WXDLLEXPORT wxFindMenuItemId(wxFrame *frame, const wxString& menuString, const wxString& itemString);
@@ -213,7 +213,7 @@ void WXDLLEXPORT wxDebugMsg(const char *fmt ...) ;
void WXDLLEXPORT wxBell(void) ; void WXDLLEXPORT wxBell(void) ;
// Get OS version // Get OS version
int WXDLLEXPORT wxGetOsVersion(int *majorVsn=NULL,int *minorVsn=NULL) ; int WXDLLEXPORT wxGetOsVersion(int *majorVsn= (int *) NULL,int *minorVsn= (int *) NULL) ;
// Set the cursor to the busy cursor for all windows // Set the cursor to the busy cursor for all windows
class WXDLLEXPORT wxCursor; class WXDLLEXPORT wxCursor;

2
include/wx/validate.h
View File

@@ -43,7 +43,7 @@ public:
// if you're passing a reference to a validator. // if you're passing a reference to a validator.
// Another possibility is to always pass a pointer to a new validator // Another possibility is to always pass a pointer to a new validator
// (so the calling code can use a copy constructor of the relevant class). // (so the calling code can use a copy constructor of the relevant class).
virtual wxValidator *Clone(void) const { return NULL; } virtual wxValidator *Clone(void) const { return (wxValidator *) NULL; }
inline bool Copy(const wxValidator& val) { m_validatorWindow = val.m_validatorWindow; return TRUE; } inline bool Copy(const wxValidator& val) { m_validatorWindow = val.m_validatorWindow; return TRUE; }
// Called when the value in the window must be validated. // Called when the value in the window must be validated.

2
include/wx/valtext.h
View File

@@ -30,7 +30,7 @@ class WXDLLEXPORT wxTextValidator: public wxValidator
{ {
DECLARE_DYNAMIC_CLASS(wxTextValidator) DECLARE_DYNAMIC_CLASS(wxTextValidator)
public: public:
wxTextValidator(long style = wxFILTER_NONE, wxString *val = NULL); wxTextValidator(long style = wxFILTER_NONE, wxString *val = (wxString *) NULL);
wxTextValidator(const wxTextValidator& val); wxTextValidator(const wxTextValidator& val);
~wxTextValidator(); ~wxTextValidator();

2
include/wx/wxexpr.h
View File

@@ -275,7 +275,7 @@ bool WXDLLEXPORT wxExprIsFunctor(wxExpr *expr, const wxString& functor);
WXDLLEXPORT_DATA(extern wxExprDatabase*) thewxExprDatabase; WXDLLEXPORT_DATA(extern wxExprDatabase*) thewxExprDatabase;
// YACC/LEX can leave memory lying around... // YACC/LEX can leave memory lying around...
extern "C" WXDLLEXPORT wxExprCleanUp(); extern "C" int WXDLLEXPORT wxExprCleanUp();
#endif #endif

20
install/unix/INSTALL
View File

@@ -57,8 +57,8 @@ Thread support:
Requires Posix threads on commercial Unix system, Requires Posix threads on commercial Unix system,
which are always present. Just compile. which are always present. Just compile.
Requires SGI threads on IRIX, which are always present. On SGI Irix we first look for sprocs, then pthreads and
Just compile. use the last one found.
Python scripting language support: Python scripting language support:
@@ -95,6 +95,21 @@ set environment variables CC and CCC as
% setenv CCC CC % setenv CCC CC
% ./configure options % ./configure options
Using the SGI native compilers, it is recommended that you
also set CFLAGS and CXXFLAGS before running configure. These
should be set to :
CFLAGS="-mips3 -n32"
CXXFLAGS="-mips3 -n32"
This is essential if you want to use the resultant binaries
on any other machine than the one it was compiled on. If you
have a 64bit machine (Octane) you should also do this to ensure
you don't accidently build the libraries as 64bit (which is
untested).
The SGI native compiler support has only been tested on Irix 6.5.
to see all the options please use: to see all the options please use:
./configure --help ./configure --help
@@ -112,6 +127,7 @@ configure for.
Configure will complain if the system variable OSTYPE has Configure will complain if the system variable OSTYPE has
not been defined. And Make in some circumstances as well... not been defined. And Make in some circumstances as well...
* General options * General options
------------------- -------------------

6
samples/config/conftest.cpp
View File

@@ -127,7 +127,7 @@ int MyApp::OnExit()
// clean up: Set() returns the active config object as Get() does, but unlike // clean up: Set() returns the active config object as Get() does, but unlike
// Get() it doesn't try to create one if there is none (definitely not what // Get() it doesn't try to create one if there is none (definitely not what
// we want here!) // we want here!)
delete wxConfigBase::Set(NULL); delete wxConfigBase::Set((wxConfigBase *) NULL);
return 0; return 0;
} }
@@ -138,7 +138,7 @@ int MyApp::OnExit()
// main frame ctor // main frame ctor
MyFrame::MyFrame() MyFrame::MyFrame()
: wxFrame(NULL, -1, "wxConfig Demo") : wxFrame((wxFrame *) NULL, -1, "wxConfig Demo")
{ {
// menu // menu
wxMenu *file_menu = new wxMenu; wxMenu *file_menu = new wxMenu;
@@ -205,7 +205,7 @@ void MyFrame::OnDelete(wxCommandEvent&)
if ( wxConfigBase::Get()->DeleteAll() ) { if ( wxConfigBase::Get()->DeleteAll() ) {
wxLogMessage("Config file/registry key successfully deleted."); wxLogMessage("Config file/registry key successfully deleted.");
delete wxConfigBase::Set(NULL); delete wxConfigBase::Set((wxConfigBase *) NULL);
wxConfigBase::DontCreateOnDemand(); wxConfigBase::DontCreateOnDemand();
} }
else else

48
samples/controls/controls.cpp
View File

@@ -92,14 +92,14 @@ IMPLEMENT_APP (MyApp)
// MyApp // MyApp
//---------------------------------------------------------------------- //----------------------------------------------------------------------
const MINIMAL_QUIT = 100; const int MINIMAL_QUIT = 100;
const MINIMAL_TEXT = 101; const int MINIMAL_TEXT = 101;
const MINIMAL_ABOUT = 102; const int MINIMAL_ABOUT = 102;
bool MyApp::OnInit(void) bool MyApp::OnInit(void)
{ {
// Create the main frame window // Create the main frame window
MyFrame *frame = new MyFrame(NULL, "Controls wxWindows App", 50, 50, 500, 420 ); MyFrame *frame = new MyFrame((wxFrame *) NULL, (char *) "Controls wxWindows App", 50, 50, 500, 420 );
// Give it an icon // Give it an icon
#ifdef __WXMSW__ #ifdef __WXMSW__
@@ -127,31 +127,31 @@ bool MyApp::OnInit(void)
// MyPanel // MyPanel
//---------------------------------------------------------------------- //----------------------------------------------------------------------
const ID_NOTEBOOK = 1000; const int ID_NOTEBOOK = 1000;
const ID_LISTBOX = 130; const int ID_LISTBOX = 130;
const ID_LISTBOX_SEL_NUM = 131; const int ID_LISTBOX_SEL_NUM = 131;
const ID_LISTBOX_SEL_STR = 132; const int ID_LISTBOX_SEL_STR = 132;
const ID_LISTBOX_CLEAR = 133; const int ID_LISTBOX_CLEAR = 133;
const ID_LISTBOX_APPEND = 134; const int ID_LISTBOX_APPEND = 134;
const ID_CHOICE = 120; const int ID_CHOICE = 120;
const ID_CHOICE_SEL_NUM = 121; const int ID_CHOICE_SEL_NUM = 121;
const ID_CHOICE_SEL_STR = 122; const int ID_CHOICE_SEL_STR = 122;
const ID_CHOICE_CLEAR = 123; const int ID_CHOICE_CLEAR = 123;
const ID_CHOICE_APPEND = 124; const int ID_CHOICE_APPEND = 124;
const ID_COMBO = 140; const int ID_COMBO = 140;
const ID_COMBO_SEL_NUM = 141; const int ID_COMBO_SEL_NUM = 141;
const ID_COMBO_SEL_STR = 142; const int ID_COMBO_SEL_STR = 142;
const ID_COMBO_CLEAR = 143; const int ID_COMBO_CLEAR = 143;
const ID_COMBO_APPEND = 144; const int ID_COMBO_APPEND = 144;
const ID_TEXT = 150; const int ID_TEXT = 150;
const ID_RADIOBOX = 160; const int ID_RADIOBOX = 160;
const ID_RADIOBOX_SEL_NUM = 161; const int ID_RADIOBOX_SEL_NUM = 161;
const ID_RADIOBOX_SEL_STR = 162; const int ID_RADIOBOX_SEL_STR = 162;
BEGIN_EVENT_TABLE(MyPanel, wxPanel) BEGIN_EVENT_TABLE(MyPanel, wxPanel)
EVT_SIZE ( MyPanel::OnSize) EVT_SIZE ( MyPanel::OnSize)

8
samples/dialogs/dialogs.cpp
View File

@@ -40,7 +40,7 @@
IMPLEMENT_APP(MyApp) IMPLEMENT_APP(MyApp)
MyCanvas *myCanvas = NULL; MyCanvas *myCanvas = (MyCanvas *) NULL;
// A macro needed for some compilers (AIX) that need 'main' to be defined // A macro needed for some compilers (AIX) that need 'main' to be defined
// in the application itself. // in the application itself.
@@ -53,7 +53,7 @@ bool MyApp::OnInit(void)
m_canvasFont = *wxNORMAL_FONT; m_canvasFont = *wxNORMAL_FONT;
// Create the main frame window // Create the main frame window
MyFrame *frame = new MyFrame(NULL, "wxWindows dialogs example", wxPoint(50, 50), wxSize(400, 300)); MyFrame *frame = new MyFrame((wxFrame *) NULL, (char *) "wxWindows dialogs example", wxPoint(50, 50), wxSize(400, 300));
// Make a menubar // Make a menubar
wxMenu *file_menu = new wxMenu; wxMenu *file_menu = new wxMenu;
@@ -78,7 +78,11 @@ bool MyApp::OnInit(void)
file_menu->AppendSeparator(); file_menu->AppendSeparator();
file_menu->Append(DIALOGS_FILE_OPEN, "&Open file"); file_menu->Append(DIALOGS_FILE_OPEN, "&Open file");
file_menu->Append(DIALOGS_FILE_SAVE, "Sa&ve file"); file_menu->Append(DIALOGS_FILE_SAVE, "Sa&ve file");
#ifndef __WXGTK__
// don't add a menu entry for something that isn't in wxGTK. It only
// confuses the user
file_menu->Append(DIALOGS_DIR_CHOOSE, "&Choose a directory"); file_menu->Append(DIALOGS_DIR_CHOOSE, "&Choose a directory");
#endif
file_menu->AppendSeparator(); file_menu->AppendSeparator();
file_menu->Append(wxID_EXIT, "E&xit"); file_menu->Append(wxID_EXIT, "E&xit");
wxMenuBar *menu_bar = new wxMenuBar; wxMenuBar *menu_bar = new wxMenuBar;

2
samples/dnd/dnd.cpp
View File

@@ -125,7 +125,7 @@ END_EVENT_TABLE()
bool DnDApp::OnInit(void) bool DnDApp::OnInit(void)
{ {
// create the main frame window // create the main frame window
DnDFrame *frame = new DnDFrame(NULL, "Drag & Drop wxWindows App", DnDFrame *frame = new DnDFrame((wxFrame *) NULL, "Drag & Drop wxWindows App",
50, 50, 450, 340); 50, 50, 450, 340);
// activate it // activate it

2
samples/docview/doc.cpp
View File

@@ -203,7 +203,7 @@ bool DrawingCommand::Undo(void)
doc->GetDoodleSegments().Append(segment); doc->GetDoodleSegments().Append(segment);
doc->Modify(TRUE); doc->Modify(TRUE);
doc->UpdateAllViews(); doc->UpdateAllViews();
segment = NULL; segment = (DoodleSegment *) NULL;
} }
doc->Modify(TRUE); doc->Modify(TRUE);
doc->UpdateAllViews(); doc->UpdateAllViews();

16
samples/docview/docview.cpp
View File

@@ -41,7 +41,7 @@
#include "doc.h" #include "doc.h"
#include "view.h" #include "view.h"
MyFrame *frame = NULL; MyFrame *frame = (MyFrame *) NULL;
// In single window mode, don't have any child windows; use // In single window mode, don't have any child windows; use
// main window. // main window.
@@ -51,7 +51,7 @@ IMPLEMENT_APP(MyApp)
MyApp::MyApp(void) MyApp::MyApp(void)
{ {
m_docManager = NULL; m_docManager = (wxDocManager *) NULL;
} }
bool MyApp::OnInit(void) bool MyApp::OnInit(void)
@@ -88,7 +88,7 @@ bool MyApp::OnInit(void)
CLASSINFO(TextEditDocument), CLASSINFO(TextEditView)); CLASSINFO(TextEditDocument), CLASSINFO(TextEditView));
//// Create the main frame window //// Create the main frame window
frame = new MyFrame(m_docManager, NULL, -1, "DocView Demo", wxPoint(0, 0), wxSize(500, 400), wxDEFAULT_FRAME_STYLE); frame = new MyFrame(m_docManager, (wxFrame *) NULL, -1, "DocView Demo", wxPoint(0, 0), wxSize(500, 400), wxDEFAULT_FRAME_STYLE);
//// Give it an icon (this is ignored in MDI mode: uses resources) //// Give it an icon (this is ignored in MDI mode: uses resources)
#ifdef __WXMSW__ #ifdef __WXMSW__
@@ -97,7 +97,7 @@ bool MyApp::OnInit(void)
//// Make a menubar //// Make a menubar
wxMenu *file_menu = new wxMenu; wxMenu *file_menu = new wxMenu;
wxMenu *edit_menu = NULL; wxMenu *edit_menu = (wxMenu *) NULL;
file_menu->Append(wxID_NEW, "&New..."); file_menu->Append(wxID_NEW, "&New...");
file_menu->Append(wxID_OPEN, "&Open..."); file_menu->Append(wxID_OPEN, "&Open...");
@@ -138,7 +138,7 @@ bool MyApp::OnInit(void)
menu_bar->Append(help_menu, "&Help"); menu_bar->Append(help_menu, "&Help");
if (singleWindowMode) if (singleWindowMode)
frame->canvas = frame->CreateCanvas(NULL, frame); frame->canvas = frame->CreateCanvas((wxView *) NULL, frame);
//// Associate the menu bar with the frame //// Associate the menu bar with the frame
frame->SetMenuBar(menu_bar); frame->SetMenuBar(menu_bar);
@@ -189,7 +189,7 @@ wxFrame *MyApp::CreateChildFrame(wxDocument *doc, wxView *view, bool isCanvas)
file_menu->Append(wxID_PREVIEW, "Print Pre&view"); file_menu->Append(wxID_PREVIEW, "Print Pre&view");
} }
wxMenu *edit_menu = NULL; wxMenu *edit_menu = (wxMenu *) NULL;
if (isCanvas) if (isCanvas)
{ {
@@ -234,8 +234,8 @@ MyFrame::MyFrame(wxDocManager *manager, wxFrame *frame, wxWindowID id, const wxS
wxDocParentFrame(manager, frame, id, title, pos, size, type) wxDocParentFrame(manager, frame, id, title, pos, size, type)
{ {
// This pointer only needed if in single window mode // This pointer only needed if in single window mode
canvas = NULL; canvas = (MyCanvas *) NULL;
editMenu = NULL; editMenu = (wxMenu *) NULL;
} }
void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) ) void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )

14
samples/docview/view.cpp
View File

@@ -128,14 +128,14 @@ bool DrawingView::OnClose(bool deleteWindow)
// Clear the canvas in case we're in single-window mode, // Clear the canvas in case we're in single-window mode,
// and the canvas stays. // and the canvas stays.
canvas->Clear(); canvas->Clear();
canvas->view = NULL; canvas->view = (wxView *) NULL;
canvas = NULL; canvas = (MyCanvas *) NULL;
wxString s(wxTheApp->GetAppName()); wxString s(wxTheApp->GetAppName());
if (frame) if (frame)
frame->SetTitle(s); frame->SetTitle(s);
SetFrame(NULL); SetFrame((wxFrame *) NULL);
Activate(FALSE); Activate(FALSE);
@@ -150,7 +150,7 @@ bool DrawingView::OnClose(bool deleteWindow)
void DrawingView::OnCut(wxCommandEvent& WXUNUSED(event) ) void DrawingView::OnCut(wxCommandEvent& WXUNUSED(event) )
{ {
DrawingDocument *doc = (DrawingDocument *)GetDocument(); DrawingDocument *doc = (DrawingDocument *)GetDocument();
doc->GetCommandProcessor()->Submit(new DrawingCommand("Cut Last Segment", DOODLE_CUT, doc, NULL)); doc->GetCommandProcessor()->Submit(new DrawingCommand((char *) "Cut Last Segment", DOODLE_CUT, doc, (DoodleSegment *) NULL));
} }
IMPLEMENT_DYNAMIC_CLASS(TextEditView, wxView) IMPLEMENT_DYNAMIC_CLASS(TextEditView, wxView)
@@ -230,7 +230,7 @@ void MyCanvas::OnMouseEvent(wxMouseEvent& event)
if (!view) if (!view)
return; return;
static DoodleSegment *currentSegment = NULL; static DoodleSegment *currentSegment = (DoodleSegment *) NULL;
wxClientDC dc(this); wxClientDC dc(this);
PrepareDC(dc); PrepareDC(dc);
@@ -244,7 +244,7 @@ void MyCanvas::OnMouseEvent(wxMouseEvent& event)
if (currentSegment->lines.Number() == 0) if (currentSegment->lines.Number() == 0)
{ {
delete currentSegment; delete currentSegment;
currentSegment = NULL; currentSegment = (DoodleSegment *) NULL;
} }
else else
{ {
@@ -254,7 +254,7 @@ void MyCanvas::OnMouseEvent(wxMouseEvent& event)
doc->GetCommandProcessor()->Submit(new DrawingCommand("Add Segment", DOODLE_ADD, doc, currentSegment)); doc->GetCommandProcessor()->Submit(new DrawingCommand("Add Segment", DOODLE_ADD, doc, currentSegment));
view->GetDocument()->Modify(TRUE); view->GetDocument()->Modify(TRUE);
currentSegment = NULL; currentSegment = (DoodleSegment *) NULL;
} }
} }

8
samples/docview/view.h
View File

@@ -46,12 +46,12 @@ class DrawingView: public wxView
wxFrame *frame; wxFrame *frame;
MyCanvas *canvas; MyCanvas *canvas;
DrawingView(void) { canvas = NULL; frame = NULL; }; DrawingView(void) { canvas = (MyCanvas *) NULL; frame = (wxFrame *) NULL; };
~DrawingView(void) {}; ~DrawingView(void) {};
bool OnCreate(wxDocument *doc, long flags); bool OnCreate(wxDocument *doc, long flags);
void OnDraw(wxDC *dc); void OnDraw(wxDC *dc);
void OnUpdate(wxView *sender, wxObject *hint = NULL); void OnUpdate(wxView *sender, wxObject *hint = (wxObject *) NULL);
bool OnClose(bool deleteWindow = TRUE); bool OnClose(bool deleteWindow = TRUE);
void OnCut(wxCommandEvent& event); void OnCut(wxCommandEvent& event);
@@ -67,12 +67,12 @@ class TextEditView: public wxView
wxFrame *frame; wxFrame *frame;
MyTextWindow *textsw; MyTextWindow *textsw;
TextEditView(wxDocument *doc = NULL): wxView(doc) { frame = NULL; textsw = NULL; } TextEditView(wxDocument *doc = (wxDocument *) NULL): wxView(doc) { frame = (wxFrame *) NULL; textsw = (MyTextWindow *) NULL; }
~TextEditView(void) {} ~TextEditView(void) {}
bool OnCreate(wxDocument *doc, long flags); bool OnCreate(wxDocument *doc, long flags);
void OnDraw(wxDC *dc); void OnDraw(wxDC *dc);
void OnUpdate(wxView *sender, wxObject *hint = NULL); void OnUpdate(wxView *sender, wxObject *hint = (wxObject *) NULL);
bool OnClose(bool deleteWindow = TRUE); bool OnClose(bool deleteWindow = TRUE);
}; };

2
samples/docvwmdi/doc.cpp
View File

@@ -203,7 +203,7 @@ bool DrawingCommand::Undo(void)
doc->GetDoodleSegments().Append(segment); doc->GetDoodleSegments().Append(segment);
doc->Modify(TRUE); doc->Modify(TRUE);
doc->UpdateAllViews(); doc->UpdateAllViews();
segment = NULL; segment = (DoodleSegment *) NULL;
} }
doc->Modify(TRUE); doc->Modify(TRUE);
doc->UpdateAllViews(); doc->UpdateAllViews();

14
samples/docvwmdi/docview.cpp
View File

@@ -37,13 +37,13 @@
#include "doc.h" #include "doc.h"
#include "view.h" #include "view.h"
MyFrame *frame = NULL; MyFrame *frame = (MyFrame *) NULL;
IMPLEMENT_APP(MyApp) IMPLEMENT_APP(MyApp)
MyApp::MyApp(void) MyApp::MyApp(void)
{ {
m_docManager = NULL; m_docManager = (wxDocManager *) NULL;
} }
bool MyApp::OnInit(void) bool MyApp::OnInit(void)
@@ -52,7 +52,7 @@ bool MyApp::OnInit(void)
m_docManager = new wxDocManager; m_docManager = new wxDocManager;
//// Create a template relating drawing documents to their views //// Create a template relating drawing documents to their views
(void) new wxDocTemplate(m_docManager, "Drawing", "*.drw", "", "drw", "Drawing Doc", "Drawing View", (void) new wxDocTemplate((wxDocManager *) m_docManager, "Drawing", "*.drw", "", "drw", "Drawing Doc", "Drawing View",
CLASSINFO(DrawingDocument), CLASSINFO(DrawingView)); CLASSINFO(DrawingDocument), CLASSINFO(DrawingView));
//// Create a template relating text documents to their views //// Create a template relating text documents to their views
@@ -60,7 +60,7 @@ bool MyApp::OnInit(void)
CLASSINFO(TextEditDocument), CLASSINFO(TextEditView)); CLASSINFO(TextEditDocument), CLASSINFO(TextEditView));
//// Create the main frame window //// Create the main frame window
frame = new MyFrame(m_docManager, NULL, "DocView Demo", wxPoint(0, 0), wxSize(500, 400), wxDEFAULT_FRAME_STYLE); frame = new MyFrame((wxDocManager *) m_docManager, (wxFrame *) NULL, (const wxString) "DocView Demo", wxPoint(0, 0), wxSize(500, 400), wxDEFAULT_FRAME_STYLE);
//// Give it an icon (this is ignored in MDI mode: uses resources) //// Give it an icon (this is ignored in MDI mode: uses resources)
#ifdef __WXMSW__ #ifdef __WXMSW__
@@ -72,7 +72,7 @@ bool MyApp::OnInit(void)
//// Make a menubar //// Make a menubar
wxMenu *file_menu = new wxMenu; wxMenu *file_menu = new wxMenu;
wxMenu *edit_menu = NULL; wxMenu *edit_menu = (wxMenu *) NULL;
file_menu->Append(wxID_NEW, "&New..."); file_menu->Append(wxID_NEW, "&New...");
file_menu->Append(wxID_OPEN, "&Open..."); file_menu->Append(wxID_OPEN, "&Open...");
@@ -147,7 +147,7 @@ wxMDIChildFrame *MyApp::CreateChildFrame(wxDocument *doc, wxView *view, bool isC
file_menu->AppendSeparator(); file_menu->AppendSeparator();
file_menu->Append(wxID_EXIT, "E&xit"); file_menu->Append(wxID_EXIT, "E&xit");
wxMenu *edit_menu = NULL; wxMenu *edit_menu = (wxMenu *) NULL;
if (isCanvas) if (isCanvas)
{ {
@@ -189,7 +189,7 @@ MyFrame::MyFrame(wxDocManager *manager, wxFrame *frame, const wxString& title,
const wxPoint& pos, const wxSize& size, long type): const wxPoint& pos, const wxSize& size, long type):
wxDocMDIParentFrame(manager, frame, -1, title, pos, size, type, "myFrame") wxDocMDIParentFrame(manager, frame, -1, title, pos, size, type, "myFrame")
{ {
editMenu = NULL; editMenu = (wxMenu *) NULL;
} }
void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) ) void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )

12
samples/docvwmdi/view.cpp
View File

@@ -106,8 +106,8 @@ bool DrawingView::OnClose(bool deleteWindow)
// Clear the canvas in case we're in single-window mode, // Clear the canvas in case we're in single-window mode,
// and the canvas stays. // and the canvas stays.
canvas->Clear(); canvas->Clear();
canvas->view = NULL; canvas->view = (wxView *) NULL;
canvas = NULL; canvas = (MyCanvas *) NULL;
wxString s(wxTheApp->GetAppName()); wxString s(wxTheApp->GetAppName());
if (frame) if (frame)
@@ -128,7 +128,7 @@ bool DrawingView::OnClose(bool deleteWindow)
void DrawingView::OnCut(wxCommandEvent& WXUNUSED(event) ) void DrawingView::OnCut(wxCommandEvent& WXUNUSED(event) )
{ {
DrawingDocument *doc = (DrawingDocument *)GetDocument(); DrawingDocument *doc = (DrawingDocument *)GetDocument();
doc->GetCommandProcessor()->Submit(new DrawingCommand("Cut Last Segment", DOODLE_CUT, doc, NULL)); doc->GetCommandProcessor()->Submit(new DrawingCommand((const wxString) "Cut Last Segment", DOODLE_CUT, doc, (DoodleSegment *) NULL));
} }
IMPLEMENT_DYNAMIC_CLASS(TextEditView, wxView) IMPLEMENT_DYNAMIC_CLASS(TextEditView, wxView)
@@ -208,7 +208,7 @@ void MyCanvas::OnMouseEvent(wxMouseEvent& event)
if (!view) if (!view)
return; return;
static DoodleSegment *currentSegment = NULL; static DoodleSegment *currentSegment = (DoodleSegment *) NULL;
wxClientDC dc(this); wxClientDC dc(this);
PrepareDC(dc); PrepareDC(dc);
@@ -222,7 +222,7 @@ void MyCanvas::OnMouseEvent(wxMouseEvent& event)
if (currentSegment->lines.Number() == 0) if (currentSegment->lines.Number() == 0)
{ {
delete currentSegment; delete currentSegment;
currentSegment = NULL; currentSegment = (DoodleSegment *) NULL;
} }
else else
{ {
@@ -232,7 +232,7 @@ void MyCanvas::OnMouseEvent(wxMouseEvent& event)
doc->GetCommandProcessor()->Submit(new DrawingCommand("Add Segment", DOODLE_ADD, doc, currentSegment)); doc->GetCommandProcessor()->Submit(new DrawingCommand("Add Segment", DOODLE_ADD, doc, currentSegment));
view->GetDocument()->Modify(TRUE); view->GetDocument()->Modify(TRUE);
currentSegment = NULL; currentSegment = (DoodleSegment *) NULL;
} }
} }

8
samples/docvwmdi/view.h
View File

@@ -46,12 +46,12 @@ class DrawingView: public wxView
wxFrame *frame; wxFrame *frame;
MyCanvas *canvas; MyCanvas *canvas;
DrawingView(void) { canvas = NULL; frame = NULL; }; DrawingView(void) { canvas = (MyCanvas *) NULL; frame = (wxFrame *) NULL; };
~DrawingView(void) {}; ~DrawingView(void) {};
bool OnCreate(wxDocument *doc, long flags); bool OnCreate(wxDocument *doc, long flags);
void OnDraw(wxDC *dc); void OnDraw(wxDC *dc);
void OnUpdate(wxView *sender, wxObject *hint = NULL); void OnUpdate(wxView *sender, wxObject *hint = (wxObject *) NULL);
bool OnClose(bool deleteWindow = TRUE); bool OnClose(bool deleteWindow = TRUE);
void OnCut(wxCommandEvent& event); void OnCut(wxCommandEvent& event);
@@ -67,12 +67,12 @@ class TextEditView: public wxView
wxFrame *frame; wxFrame *frame;
MyTextWindow *textsw; MyTextWindow *textsw;
TextEditView(wxDocument *doc = NULL): wxView(doc) { frame = NULL; textsw = NULL; } TextEditView(wxDocument *doc = (wxDocument *) NULL): wxView(doc) { frame = (wxFrame *) NULL; textsw = (MyTextWindow *) NULL; }
~TextEditView(void) {} ~TextEditView(void) {}
bool OnCreate(wxDocument *doc, long flags); bool OnCreate(wxDocument *doc, long flags);
void OnDraw(wxDC *dc); void OnDraw(wxDC *dc);
void OnUpdate(wxView *sender, wxObject *hint = NULL); void OnUpdate(wxView *sender, wxObject *hint = (wxObject *) NULL);
bool OnClose(bool deleteWindow = TRUE); bool OnClose(bool deleteWindow = TRUE);
}; };

113
samples/dynamic/minimal.cpp Normal file
View File

@@ -0,0 +1,113 @@
/////////////////////////////////////////////////////////////////////////////
// Name: minimal.cpp
// Purpose: Dynamic events wxWindows sample
// Author: Julian Smart
// Modified by:
// Created: 04/01/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
#pragma implementation "minimal.cpp"
#pragma interface "minimal.cpp"
#endif
// For compilers that support precompilation, includes "wx/wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#endif
#ifndef WX_PRECOMP
#include "wx/wx.h"
#endif
#ifdef __WXGTK__
#include "mondrian.xpm"
#endif
// Define a new application type
class MyApp: public wxApp
{ public:
bool OnInit(void);
};
// Define a new frame type
class MyFrame: public wxFrame
{ public:
MyFrame(wxFrame *frame, char *title, int x, int y, int w, int h);
public:
void OnQuit(wxCommandEvent& event);
void OnAbout(wxCommandEvent& event);
bool OnClose(void) { return TRUE; }
};
// ID for the menu commands
#define MINIMAL_QUIT 1
#define MINIMAL_TEXT 101
#define MINIMAL_ABOUT 102
// Create a new application object
IMPLEMENT_APP (MyApp)
// `Main program' equivalent, creating windows and returning main app frame
bool MyApp::OnInit(void)
{
// Create the main frame window
MyFrame *frame = new MyFrame((wxFrame *) NULL, (char *) "Minimal wxWindows App", 50, 50, 450, 340);
frame->Connect( MINIMAL_QUIT, -1, wxEVT_COMMAND_MENU_SELECTED, (wxObjectEventFunction)MyFrame::OnQuit );
frame->Connect( MINIMAL_ABOUT, -1, wxEVT_COMMAND_MENU_SELECTED, (wxObjectEventFunction)MyFrame::OnAbout );
// Give it an icon
#ifdef __WXMSW__
frame->SetIcon(wxIcon("mondrian"));
#else
frame->SetIcon(wxIcon(mondrian_xpm));
#endif
// Make a menubar
wxMenu *file_menu = new wxMenu;
file_menu->Append(MINIMAL_ABOUT, "&About");
file_menu->Append(MINIMAL_QUIT, "E&xit");
wxMenuBar *menu_bar = new wxMenuBar;
menu_bar->Append(file_menu, "&File");
frame->SetMenuBar(menu_bar);
// Make a panel with a message
wxPanel *panel = new wxPanel(frame, -1, wxPoint(0, 0), wxSize(400, 200), wxTAB_TRAVERSAL);
(void)new wxStaticText(panel, 311, "Hello!", wxPoint(10, 10), wxSize(-1, -1), 0);
// Show the frame
frame->Show(TRUE);
SetTopWindow(frame);
return TRUE;
}
// My frame constructor
MyFrame::MyFrame(wxFrame *frame, char *title, int x, int y, int w, int h):
wxFrame(frame, -1, title, wxPoint(x, y), wxSize(w, h))
{}
void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event) )
{
Close(TRUE);
}
void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
{
wxMessageDialog dialog(this, "This is a minimal sample\nA second line in the message box",
"About Minimal", wxYES_NO|wxCANCEL);
dialog.ShowModal();
}

2
samples/forty/pile.cpp
View File

@@ -76,7 +76,7 @@ Pile::Pile(int x, int y, int dx, int dy)
void Pile::Redraw(wxDC& dc ) void Pile::Redraw(wxDC& dc )
{ {
wxWindow *frame = wxTheApp->GetTopWindow(); wxWindow *frame = wxTheApp->GetTopWindow();
wxWindow *canvas = NULL; wxWindow *canvas = (wxWindow *) NULL;
if (frame) if (frame)
{ {
wxNode *node = frame->GetChildren()->First(); wxNode *node = frame->GetChildren()->First();

8
samples/forty/scorefil.cpp
View File

@@ -149,10 +149,10 @@ void ScoreFile::ReadPlayersScore(
m_config->SetPath("/Players"); m_config->SetPath("/Players");
m_config->SetPath(player); m_config->SetPath(player);
if (m_config->Read(&myScore, "Score") && if (m_config->Read(&myScore, (const char *) "Score",0L) &&
m_config->Read(&myGames, "Games") && m_config->Read(&myGames, (const char *) "Games",0L) &&
m_config->Read(&myWins, "Wins") && m_config->Read(&myWins, (const char *) "Wins",0L) &&
m_config->Read(&check, "Check")) m_config->Read(&check, (const char *) "Check",0L))
{ {
if (check != CalcCheck(player, myGames, myWins, myScore)) if (check != CalcCheck(player, myGames, myWins, myScore))
{ {

10
samples/grid/test.cpp
View File

@@ -62,8 +62,8 @@ class MyFrame: public wxFrame
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };
wxBitmap *cellBitmap1 = NULL; wxBitmap *cellBitmap1 = (wxBitmap *) NULL;
wxBitmap *cellBitmap2 = NULL; wxBitmap *cellBitmap2 = (wxBitmap *) NULL;
// ID for the menu quit command // ID for the menu quit command
#define GRID_QUIT 1 #define GRID_QUIT 1
@@ -94,7 +94,7 @@ bool MyApp::OnInit(void)
#endif #endif
// Create the main frame window // Create the main frame window
MyFrame *frame = new MyFrame(NULL, "wxGrid Sample", wxPoint(50, 50), wxSize(450, 300)); MyFrame *frame = new MyFrame((wxFrame *) NULL, (char *) "wxGrid Sample", wxPoint(50, 50), wxSize(450, 300));
// Give it an icon // Give it an icon
#ifdef __WXMSW__ #ifdef __WXMSW__
@@ -161,7 +161,7 @@ bool MyApp::OnInit(void)
MyFrame::MyFrame(wxFrame *frame, const wxString& title, const wxPoint& pos, const wxSize& size): MyFrame::MyFrame(wxFrame *frame, const wxString& title, const wxPoint& pos, const wxSize& size):
wxFrame(frame, -1, title, pos, size) wxFrame(frame, -1, title, pos, size)
{ {
grid = NULL; grid = (wxGenericGrid *) NULL;
} }
BEGIN_EVENT_TABLE(MyFrame, wxFrame) BEGIN_EVENT_TABLE(MyFrame, wxFrame)
@@ -210,7 +210,7 @@ void MyFrame::ToggleDividers(wxCommandEvent& WXUNUSED(event))
if (!grid->GetDividerPen()) if (!grid->GetDividerPen())
grid->SetDividerPen(wxThePenList->FindOrCreatePen("LIGHT GREY", 1, wxSOLID)); grid->SetDividerPen(wxThePenList->FindOrCreatePen("LIGHT GREY", 1, wxSOLID));
else else
grid->SetDividerPen(NULL); grid->SetDividerPen((wxPen *) NULL);
grid->Refresh(); grid->Refresh();
} }

2
samples/internat/internat.cpp
View File

@@ -95,7 +95,7 @@ bool MyApp::OnInit(void)
m_locale.AddCatalog("fileutils"); // 3) and another just for testing m_locale.AddCatalog("fileutils"); // 3) and another just for testing
// Create the main frame window // Create the main frame window
MyFrame *frame = new MyFrame(NULL, _("Minimal wxWindows App"), 50, 50, 150, 40); MyFrame *frame = new MyFrame((wxFrame *) NULL, _("Minimal wxWindows App"), 50, 50, 150, 40);
// Give it an icon // Give it an icon
#ifdef __WXMSW__ #ifdef __WXMSW__

16
samples/layout/layout.cpp
View File

@@ -28,8 +28,8 @@
#include "layout.h" #include "layout.h"
// Declare two frames // Declare two frames
MyFrame *frame = NULL; MyFrame *frame = (MyFrame *) NULL;
wxMenuBar *menu_bar = NULL; wxMenuBar *menu_bar = (wxMenuBar *) NULL;
IMPLEMENT_APP(MyApp) IMPLEMENT_APP(MyApp)
@@ -40,7 +40,7 @@ MyApp::MyApp()
bool MyApp::OnInit(void) bool MyApp::OnInit(void)
{ {
// Create the main frame window // Create the main frame window
frame = new MyFrame(NULL, "wxWindows Layout Demo", 0, 0, 550, 500); frame = new MyFrame((MyFrame *) NULL, (char *) "wxWindows Layout Demo", 0, 0, 550, 500);
frame->SetAutoLayout(TRUE); frame->SetAutoLayout(TRUE);
@@ -156,9 +156,9 @@ bool MyApp::OnInit(void)
MyFrame::MyFrame(wxFrame *frame, char *title, int x, int y, int w, int h): MyFrame::MyFrame(wxFrame *frame, char *title, int x, int y, int w, int h):
wxFrame(frame, -1, title, wxPoint(x, y), wxSize(w, h)) wxFrame(frame, -1, title, wxPoint(x, y), wxSize(w, h))
{ {
panel = NULL; panel = (wxPanel *) NULL;
text_window = NULL; text_window = (MyTextWindow *) NULL;
canvas = NULL; canvas = (MyWindow *) NULL;
} }
BEGIN_EVENT_TABLE(MyFrame, wxFrame) BEGIN_EVENT_TABLE(MyFrame, wxFrame)
@@ -171,7 +171,7 @@ END_EVENT_TABLE()
void MyFrame::LoadFile(wxCommandEvent& WXUNUSED(event) ) void MyFrame::LoadFile(wxCommandEvent& WXUNUSED(event) )
{ {
char *s = wxFileSelector("Load text file", NULL, NULL, NULL, "*.txt"); char *s = wxFileSelector("Load text file", (const char *) NULL, (const char *) NULL, (const char *) NULL, "*.txt");
if (s) if (s)
{ {
#ifdef __WXMSW__ #ifdef __WXMSW__
@@ -187,7 +187,7 @@ void MyFrame::Quit(wxCommandEvent& WXUNUSED(event) )
void MyFrame::TestSizers(wxCommandEvent& WXUNUSED(event) ) void MyFrame::TestSizers(wxCommandEvent& WXUNUSED(event) )
{ {
SizerFrame *newFrame = new SizerFrame(NULL, "Sizer Test Frame", 50, 50, 500, 500); SizerFrame *newFrame = new SizerFrame((MyFrame *) NULL, (char *) "Sizer Test Frame", 50, 50, 500, 500);
newFrame->Show(TRUE); newFrame->Show(TRUE);
} }

12
samples/listctrl/listtest.cpp
View File

@@ -58,7 +58,7 @@ IMPLEMENT_APP(MyApp)
bool MyApp::OnInit(void) bool MyApp::OnInit(void)
{ {
// Create the main frame window // Create the main frame window
MyFrame *frame = new MyFrame(NULL, "wxListCtrl Test", 50, 50, 450, 340); MyFrame *frame = new MyFrame((wxFrame *) NULL, (char *) "wxListCtrl Test", 50, 50, 450, 340);
// This reduces flicker effects - even better would be to define OnEraseBackground // This reduces flicker effects - even better would be to define OnEraseBackground
// to do nothing. When the list control's scrollbars are show or hidden, the // to do nothing. When the list control's scrollbars are show or hidden, the
@@ -175,8 +175,8 @@ bool MyApp::OnInit(void)
MyFrame::MyFrame(wxFrame *frame, char *title, int x, int y, int w, int h): MyFrame::MyFrame(wxFrame *frame, char *title, int x, int y, int w, int h):
wxFrame(frame, -1, title, wxPoint(x, y), wxSize(w, h)) wxFrame(frame, -1, title, wxPoint(x, y), wxSize(w, h))
{ {
m_listCtrl = NULL; m_listCtrl = (MyListCtrl *) NULL;
m_logWindow = NULL; m_logWindow = (wxTextCtrl *) NULL;
} }
MyFrame::~MyFrame(void) MyFrame::~MyFrame(void)
@@ -203,8 +203,8 @@ void MyFrame::OnListView(wxCommandEvent& WXUNUSED(event))
m_logWindow->Clear(); m_logWindow->Clear();
m_listCtrl->DeleteAllItems(); m_listCtrl->DeleteAllItems();
m_listCtrl->SetSingleStyle(wxLC_LIST); m_listCtrl->SetSingleStyle(wxLC_LIST);
m_listCtrl->SetImageList(NULL, wxIMAGE_LIST_NORMAL); m_listCtrl->SetImageList((wxImageList *) NULL, wxIMAGE_LIST_NORMAL);
m_listCtrl->SetImageList(NULL, wxIMAGE_LIST_SMALL); m_listCtrl->SetImageList((wxImageList *) NULL, wxIMAGE_LIST_SMALL);
for ( int i=0; i < 30; i++) for ( int i=0; i < 30; i++)
{ {
@@ -219,7 +219,7 @@ void MyFrame::OnReportView(wxCommandEvent& WXUNUSED(event))
m_logWindow->Clear(); m_logWindow->Clear();
m_listCtrl->DeleteAllItems(); m_listCtrl->DeleteAllItems();
m_listCtrl->SetSingleStyle(wxLC_REPORT); m_listCtrl->SetSingleStyle(wxLC_REPORT);
m_listCtrl->SetImageList(NULL, wxIMAGE_LIST_NORMAL); m_listCtrl->SetImageList((wxImageList *) NULL, wxIMAGE_LIST_NORMAL);
m_listCtrl->SetImageList(wxGetApp().m_imageListSmall, wxIMAGE_LIST_SMALL); m_listCtrl->SetImageList(wxGetApp().m_imageListSmall, wxIMAGE_LIST_SMALL);
m_listCtrl->InsertColumn(0, "Column 1", wxLIST_FORMAT_LEFT, 140); m_listCtrl->InsertColumn(0, "Column 1", wxLIST_FORMAT_LEFT, 140);

22
samples/mdi/mdi.cpp
View File

@@ -38,7 +38,7 @@
#include "mdi.h" #include "mdi.h"
MyFrame *frame = NULL; MyFrame *frame = (MyFrame *) NULL;
wxList my_children; wxList my_children;
IMPLEMENT_APP(MyApp) IMPLEMENT_APP(MyApp)
@@ -54,7 +54,7 @@ bool MyApp::OnInit(void)
{ {
// Create the main frame window // Create the main frame window
frame = new MyFrame(NULL, -1, "MDI Demo", wxPoint(0, 0), wxSize(500, 400), frame = new MyFrame((wxFrame *) NULL, -1, (char *) "MDI Demo", wxPoint(0, 0), wxSize(500, 400),
wxDEFAULT_FRAME | wxHSCROLL | wxVSCROLL); wxDEFAULT_FRAME | wxHSCROLL | wxVSCROLL);
// Give it an icon (this is ignored in MDI mode: uses resources) // Give it an icon (this is ignored in MDI mode: uses resources)
@@ -274,7 +274,7 @@ MyChild::MyChild(wxMDIParentFrame *parent, const wxString& title, const wxPoint&
const long style): const long style):
wxMDIChildFrame(parent, -1, title, pos, size, style) wxMDIChildFrame(parent, -1, title, pos, size, style)
{ {
canvas = NULL; canvas = (MyCanvas *) NULL;
my_children.Append(this); my_children.Append(this);
} }
@@ -330,24 +330,24 @@ void MyFrame::InitToolBar(wxToolBar* toolBar)
#endif #endif
int currentX = 5; int currentX = 5;
toolBar->AddTool(0, *(bitmaps[0]), wxNullBitmap, FALSE, currentX, -1, NULL, "New file"); toolBar->AddTool(0, *(bitmaps[0]), wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "New file");
currentX += width + 5; currentX += width + 5;
toolBar->AddTool(1, *bitmaps[1], wxNullBitmap, FALSE, currentX, -1, NULL, "Open file"); toolBar->AddTool(1, *bitmaps[1], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "Open file");
currentX += width + 5; currentX += width + 5;
toolBar->AddTool(2, *bitmaps[2], wxNullBitmap, FALSE, currentX, -1, NULL, "Save file"); toolBar->AddTool(2, *bitmaps[2], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "Save file");
currentX += width + 5; currentX += width + 5;
toolBar->AddSeparator(); toolBar->AddSeparator();
toolBar->AddTool(3, *bitmaps[3], wxNullBitmap, FALSE, currentX, -1, NULL, "Copy"); toolBar->AddTool(3, *bitmaps[3], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "Copy");
currentX += width + 5; currentX += width + 5;
toolBar->AddTool(4, *bitmaps[4], wxNullBitmap, FALSE, currentX, -1, NULL, "Cut"); toolBar->AddTool(4, *bitmaps[4], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "Cut");
currentX += width + 5; currentX += width + 5;
toolBar->AddTool(5, *bitmaps[5], wxNullBitmap, FALSE, currentX, -1, NULL, "Paste"); toolBar->AddTool(5, *bitmaps[5], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "Paste");
currentX += width + 5; currentX += width + 5;
toolBar->AddSeparator(); toolBar->AddSeparator();
toolBar->AddTool(6, *bitmaps[6], wxNullBitmap, FALSE, currentX, -1, NULL, "Print"); toolBar->AddTool(6, *bitmaps[6], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "Print");
currentX += width + 5; currentX += width + 5;
toolBar->AddSeparator(); toolBar->AddSeparator();
toolBar->AddTool(7, *bitmaps[7], wxNullBitmap, TRUE, currentX, -1, NULL, "Help"); toolBar->AddTool(7, *bitmaps[7], wxNullBitmap, TRUE, currentX, -1, (wxObject *) NULL, "Help");
toolBar->Realize(); toolBar->Realize();

2
samples/memcheck/memcheck.cpp
View File

@@ -58,7 +58,7 @@ IMPLEMENT_APP(MyApp)
bool MyApp::OnInit(void) bool MyApp::OnInit(void)
{ {
// Create the main frame window // Create the main frame window
MyFrame *frame = new MyFrame(NULL); MyFrame *frame = new MyFrame((wxFrame *) NULL);
// Give it an icon // Give it an icon
#ifdef wx_msw #ifdef wx_msw

2
samples/minimal/minimal.cpp
View File

@@ -66,7 +66,7 @@ IMPLEMENT_APP (MyApp)
bool MyApp::OnInit(void) bool MyApp::OnInit(void)
{ {
// Create the main frame window // Create the main frame window
MyFrame *frame = new MyFrame(NULL, "Minimal wxWindows App", 50, 50, 450, 340); MyFrame *frame = new MyFrame((wxFrame *) NULL, (char *) "Minimal wxWindows App", 50, 50, 450, 340);
// Give it an icon // Give it an icon
#ifdef __WXMSW__ #ifdef __WXMSW__

12
samples/png/pngdemo.cpp
View File

@@ -26,8 +26,8 @@
#include "pngdemo.h" #include "pngdemo.h"
MyFrame *frame = NULL; MyFrame *frame = (MyFrame *) NULL;
wxBitmap *g_TestBitmap = NULL; wxBitmap *g_TestBitmap = (wxBitmap *) NULL;
IMPLEMENT_APP(MyApp) IMPLEMENT_APP(MyApp)
@@ -42,7 +42,7 @@ bool MyApp::OnInit(void)
#endif #endif
// Create the main frame window // Create the main frame window
frame = new MyFrame(NULL, "wxPNGBitmap Demo", wxPoint(0, 0), wxSize(300, 300)); frame = new MyFrame((wxFrame *) NULL, "wxPNGBitmap Demo", wxPoint(0, 0), wxSize(300, 300));
// Give it a status line // Give it a status line
frame->CreateStatusBar(2); frame->CreateStatusBar(2);
@@ -86,7 +86,7 @@ END_EVENT_TABLE()
MyFrame::MyFrame(wxFrame *frame, const wxString& title, const wxPoint& pos, const wxSize& size): MyFrame::MyFrame(wxFrame *frame, const wxString& title, const wxPoint& pos, const wxSize& size):
wxFrame(frame, -1, title, pos, size) wxFrame(frame, -1, title, pos, size)
{ {
canvas = NULL; canvas = (MyCanvas *) NULL;
} }
void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
@@ -103,7 +103,7 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
void MyFrame::OnLoadFile(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnLoadFile(wxCommandEvent& WXUNUSED(event))
{ {
// Show file selector. // Show file selector.
char *f = wxFileSelector("Open Image", NULL, NULL,"png", char *f = wxFileSelector("Open Image", (const char *) NULL, (const char *) NULL,"png",
"PNG files (*.png)|*.png"); "PNG files (*.png)|*.png");
if (!f) if (!f)
@@ -115,7 +115,7 @@ void MyFrame::OnLoadFile(wxCommandEvent& WXUNUSED(event))
if (!g_TestBitmap->Ok()) if (!g_TestBitmap->Ok())
{ {
delete g_TestBitmap; delete g_TestBitmap;
g_TestBitmap = NULL; g_TestBitmap = (wxBitmap *) NULL;
} }
canvas->Refresh(); canvas->Refresh();

8
samples/printing/printing.cpp
View File

@@ -39,7 +39,7 @@
#include "printing.h" #include "printing.h"
// Declare a frame // Declare a frame
MyFrame *frame = NULL; MyFrame *frame = (MyFrame *) NULL;
int orientation = wxPORTRAIT; int orientation = wxPORTRAIT;
// Main proc // Main proc
@@ -75,7 +75,7 @@ bool MyApp::OnInit(void)
labelFont = new wxFont(12, wxROMAN, wxITALIC, wxBOLD); labelFont = new wxFont(12, wxROMAN, wxITALIC, wxBOLD);
// Create the main frame window // Create the main frame window
frame = new MyFrame(NULL, "wxWindows Printing Demo", wxPoint(0, 0), wxSize(400, 400)); frame = new MyFrame((wxFrame *) NULL, (char *) "wxWindows Printing Demo", wxPoint(0, 0), wxSize(400, 400));
// Give it a status line // Give it a status line
frame->CreateStatusBar(2); frame->CreateStatusBar(2);
@@ -156,7 +156,7 @@ END_EVENT_TABLE()
MyFrame::MyFrame(wxFrame *frame, const wxString& title, const wxPoint& pos, const wxSize& size): MyFrame::MyFrame(wxFrame *frame, const wxString& title, const wxPoint& pos, const wxSize& size):
wxFrame(frame, -1, title, pos, size) wxFrame(frame, -1, title, pos, size)
{ {
canvas = NULL; canvas = (MyCanvas *) NULL;
} }
void MyFrame::OnExit(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnExit(wxCommandEvent& WXUNUSED(event))
@@ -531,7 +531,7 @@ void MyPrintout::DrawPageTwo(wxDC *dc)
// Writes a header on a page. Margin units are in millimetres. // Writes a header on a page. Margin units are in millimetres.
bool WritePageHeader(wxPrintout *printout, wxDC *dc, char *text, float mmToLogical) bool WritePageHeader(wxPrintout *printout, wxDC *dc, char *text, float mmToLogical)
{ {
static wxFont *headerFont = NULL; static wxFont *headerFont = (wxFont *) NULL;
if (!headerFont) if (!headerFont)
{ {
headerFont = wxTheFontList->FindOrCreateFont(16, wxSWISS, wxNORMAL, wxBOLD); headerFont = wxTheFontList->FindOrCreateFont(16, wxSWISS, wxNORMAL, wxBOLD);

6
samples/resource/resource.cpp
View File

@@ -56,7 +56,7 @@ static char *menu1 = NULL;
#endif #endif
// Declare two frames // Declare two frames
MyFrame *frame = NULL; MyFrame *frame = (MyFrame *) NULL;
IMPLEMENT_APP(MyApp) IMPLEMENT_APP(MyApp)
@@ -86,7 +86,7 @@ bool MyApp::OnInit(void)
#endif #endif
// Create the main frame window // Create the main frame window
frame = new MyFrame(NULL, -1, "wxWindows Resource Sample", wxPoint(0, 0), wxSize(300, 250)); frame = new MyFrame((wxFrame *) NULL, -1, (char *) "wxWindows Resource Sample", wxPoint(0, 0), wxSize(300, 250));
// Give it a status line // Give it a status line
frame->CreateStatusBar(2); frame->CreateStatusBar(2);
@@ -144,7 +144,7 @@ END_EVENT_TABLE()
MyFrame::MyFrame(wxWindow *parent, const wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size): MyFrame::MyFrame(wxWindow *parent, const wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size):
wxFrame(parent, id, title, pos, size) wxFrame(parent, id, title, pos, size)
{ {
panel = NULL; panel = (wxWindow *) NULL;
} }
void MyFrame::OnQuit( wxCommandEvent& WXUNUSED(event) ) void MyFrame::OnQuit( wxCommandEvent& WXUNUSED(event) )

2
samples/splitter/test.cpp
View File

@@ -87,7 +87,7 @@ IMPLEMENT_APP(MyApp)
bool MyApp::OnInit(void) bool MyApp::OnInit(void)
{ {
MyFrame* frame = new MyFrame(NULL, "wxSplitterWindow Example", wxPoint(50, 50), wxSize(400, 300)); MyFrame* frame = new MyFrame((wxFrame *) NULL, (char *) "wxSplitterWindow Example", wxPoint(50, 50), wxSize(400, 300));
// Show the frame // Show the frame
frame->Show(TRUE); frame->Show(TRUE);

Some files were not shown because too many files have changed in this diff Show More