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

Sorry, I went and removed consts as per the style guide :-)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@179 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1998-07-04 15:17:59 +00:00
parent eafc087e69
commit debe6624c1
252 changed files with 2684 additions and 2981 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/latex/wx/cmdevent.tex
View File

@@ -27,6 +27,8 @@ which is generated by a wxCheckBox control.}
which is generated by a wxChoice control.} which is generated by a wxChoice control.}
\twocolitem{{\bf EVT\_LISTBOX(id, func)}}{Process a wxEVT\_COMMAND\_LISTBOX\_SELECTED command, \twocolitem{{\bf EVT\_LISTBOX(id, func)}}{Process a wxEVT\_COMMAND\_LISTBOX\_SELECTED command,
which is generated by a wxListBox control.} which is generated by a wxListBox control.}
\twocolitem{{\bf EVT\_LISTBOX_DCLICK(id, func)}}{Process a wxEVT\_COMMAND\_LISTBOX\_DOUBLECLICKED command,
which is generated by a wxListBox control.}
\twocolitem{{\bf EVT\_TEXT(id, func)}}{Process a wxEVT\_COMMAND\_TEXT\_UPDATED command, \twocolitem{{\bf EVT\_TEXT(id, func)}}{Process a wxEVT\_COMMAND\_TEXT\_UPDATED command,
which is generated by a wxTextCtrl control.} which is generated by a wxTextCtrl control.}
\twocolitem{{\bf EVT\_TEXT\_ENTER(id, func)}}{Process a wxEVT\_COMMAND\_TEXT\_ENTER command, \twocolitem{{\bf EVT\_TEXT\_ENTER(id, func)}}{Process a wxEVT\_COMMAND\_TEXT\_ENTER command,

3
docs/latex/wx/listbox.tex
View File

@@ -10,8 +10,7 @@ selections).
List box elements are numbered from zero. List box elements are numbered from zero.
A listbox callback gets an event wxEVT\_COMMAND\_LISTBOX\_SELECT for single clicks, and A listbox callback gets an event wxEVT\_COMMAND\_LISTBOX\_SELECT for single clicks, and
wxEVT\_COMMAND\_LISTBOX\_DOUBLE\_CLICKED for double clicks. Another way of intercepting wxEVT\_COMMAND\_LISTBOX\_DOUBLE\_CLICKED for double clicks.
double clicks is to override \helpref{wxWindow::OnDefaultAction}{wxwindowondefaultaction}.
\wxheading{Derived from} \wxheading{Derived from}

15
docs/latex/wx/window.tex
View File

@@ -841,21 +841,6 @@ destroying the window if it returns TRUE or if the close is being forced.
\helpref{wxWindow::Destroy}{wxwindowdestroy},\rtfsp \helpref{wxWindow::Destroy}{wxwindowdestroy},\rtfsp
\helpref{wxCloseEvent}{wxcloseevent} \helpref{wxCloseEvent}{wxcloseevent}
\membersection{wxWindow::OnDefaultAction}\label{wxwindowondefaultaction}
\func{virtual void}{OnDefaultAction}{\param{wxControl* }{control}}
Called when the user initiates the default action for a panel or
dialog box, for example by double clicking on a listbox.
\wxheading{Parameters}
\docparam{control}{The control which caused the default action.}
\wxheading{Remarks}
TODO: eliminate this?? Or keep it for backward compatibility?
\membersection{wxWindow::OnDropFiles}\label{wxwindowondropfiles} \membersection{wxWindow::OnDropFiles}\label{wxwindowondropfiles}
\func{void}{OnDropFiles}{\param{wxDropFilesEvent\&}{ event}} \func{void}{OnDropFiles}{\param{wxDropFilesEvent\&}{ event}}

24
include/wx/date.h
View File

@@ -47,8 +47,8 @@ class WXDLLEXPORT wxDate: public wxObject
public: public:
wxDate (); wxDate ();
wxDate (const long j); wxDate (long j);
wxDate (const int m, const int d, const int y); wxDate (int m, int d, int y);
wxDate (const wxString& dat); wxDate (const wxString& dat);
wxDate (const wxDate &dt); wxDate (const wxDate &dt);
@@ -56,16 +56,16 @@ class WXDLLEXPORT wxDate: public wxObject
void operator = (const wxDate& date); void operator = (const wxDate& date);
void operator = (const wxString& date); void operator = (const wxString& date);
wxDate operator + (const long i); wxDate operator + (long i);
wxDate operator + (const int i); wxDate operator + (int i);
wxDate operator - (const long i); wxDate operator - (long i);
wxDate operator - (const int i); wxDate operator - (int i);
long operator - (const wxDate &dt); long operator - (const wxDate &dt);
wxDate &operator += (const long i); wxDate &operator += (long i);
wxDate &operator -= (const long i); wxDate &operator -= (long i);
wxDate &operator ++ (); // Prefix increment wxDate &operator ++ (); // Prefix increment
wxDate &operator ++ (int); // Postfix increment wxDate &operator ++ (int); // Postfix increment
@@ -81,9 +81,9 @@ class WXDLLEXPORT wxDate: public wxObject
friend ostream &operator << (ostream &os, const wxDate &dt); friend ostream &operator << (ostream &os, const wxDate &dt);
wxString FormatDate (const int type=-1) const; wxString FormatDate (int type=-1) const;
void SetFormat (const int format); void SetFormat (int format);
int SetOption (const int option, const bool enable=TRUE); int SetOption (int option, bool enable=TRUE);
long GetJulianDate() const; // returns julian date long GetJulianDate() const; // returns julian date
int GetDayOfYear() const; // returns relative date since Jan. 1 int GetDayOfYear() const; // returns relative date since Jan. 1
@@ -123,7 +123,7 @@ class WXDLLEXPORT wxDate: public wxObject
bool IsBetween(const wxDate& first, const wxDate& second) const; bool IsBetween(const wxDate& first, const wxDate& second) const;
wxDate Previous(const int dayOfWeek) const; wxDate Previous(int dayOfWeek) const;
}; };
#endif #endif

4
include/wx/docview.h
View File

@@ -357,7 +357,7 @@ class WXDLLEXPORT wxDocChildFrame: public wxFrame
public: public:
wxDocChildFrame(wxDocument *doc, wxView *view, wxFrame *frame, const wxString& title, wxDocChildFrame(wxDocument *doc, wxView *view, wxFrame *frame, const wxString& title,
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
const long type = wxDEFAULT_FRAME_STYLE, const wxString& name = "frame"); long type = wxDEFAULT_FRAME_STYLE, const wxString& name = "frame");
~wxDocChildFrame(void); ~wxDocChildFrame(void);
bool OnClose(void); bool OnClose(void);
@@ -389,7 +389,7 @@ class WXDLLEXPORT wxDocParentFrame: public wxFrame
public: public:
wxDocParentFrame(wxDocManager *manager, wxFrame *frame, const wxString& title, wxDocParentFrame(wxDocManager *manager, wxFrame *frame, const wxString& title,
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
const long type = wxDEFAULT_FRAME, const wxString& name = "frame"); long type = wxDEFAULT_FRAME, const wxString& name = "frame");
bool OnClose(void); bool OnClose(void);
// Extend event processing to search the document manager's event table // Extend event processing to search the document manager's event table

15
include/wx/event.h
View File

@@ -261,7 +261,7 @@ public:
// Can instruct event processor that we wish to ignore this event // Can instruct event processor that we wish to ignore this event
// (treat as if the event table entry had not been found) // (treat as if the event table entry had not been found)
inline void Skip(const bool skip = TRUE) { m_skipped = skip; } inline void Skip(bool skip = TRUE) { m_skipped = skip; }
inline bool GetSkipped(void) const { return m_skipped; }; inline bool GetSkipped(void) const { return m_skipped; };
public: public:
@@ -965,6 +965,8 @@ class WXDLLEXPORT wxEvtHandler: public wxObject
// callback function // callback function
// Default behaviour // Default behaviour
virtual long Default(void) { if (GetNextHandler()) return GetNextHandler()->Default(); else return 0; }; virtual long Default(void) { if (GetNextHandler()) return GetNextHandler()->Default(); else return 0; };
/*
#if WXWIN_COMPATIBILITY #if WXWIN_COMPATIBILITY
virtual void OldOnMenuCommand(int WXUNUSED(cmd)); virtual void OldOnMenuCommand(int WXUNUSED(cmd));
virtual void OldOnMenuSelect(int WXUNUSED(cmd)); virtual void OldOnMenuSelect(int WXUNUSED(cmd));
@@ -982,12 +984,14 @@ class WXDLLEXPORT wxEvtHandler: public wxObject
virtual void OldOnKillFocus(void); virtual void OldOnKillFocus(void);
virtual bool OldOnSysColourChange(void); virtual bool OldOnSysColourChange(void);
virtual void OldOnDropFiles(int n, char *files[], int x, int y); virtual void OldOnDropFiles(int n, char *files[], int x, int y);
#endif
virtual bool OnClose(void);
virtual void OnDefaultAction(wxControl *WXUNUSED(initiatingItem)) {}; virtual void OnDefaultAction(wxControl *WXUNUSED(initiatingItem)) {};
virtual void OnChangeFocus(wxControl *WXUNUSED(from), wxControl *WXUNUSED(to)) {}; virtual void OnChangeFocus(wxControl *WXUNUSED(from), wxControl *WXUNUSED(to)) {};
virtual bool OnFunctionKey(wxKeyEvent &WXUNUSED(event)) { return FALSE; }; virtual bool OnFunctionKey(wxKeyEvent &WXUNUSED(event)) { return FALSE; };
#endif
*/
virtual bool OnClose(void);
inline char *GetClientData(void) const { return m_clientData; } inline char *GetClientData(void) const { return m_clientData; }
inline void SetClientData(char *clientData) { m_clientData = clientData; } inline void SetClientData(char *clientData) { m_clientData = clientData; }
@@ -995,8 +999,8 @@ class WXDLLEXPORT wxEvtHandler: public wxObject
virtual bool ProcessEvent(wxEvent& event); virtual bool ProcessEvent(wxEvent& event);
virtual bool SearchEventTable(wxEventTable& table, wxEvent& event); virtual bool SearchEventTable(wxEventTable& table, wxEvent& event);
void Connect( const int id, const int lastId, void Connect( int id, int lastId,
const int eventType, int eventType,
wxObjectEventFunction func, wxObjectEventFunction func,
wxObject *userData = NULL ); wxObject *userData = NULL );
@@ -1163,6 +1167,7 @@ const wxEventTableEntry theClass::sm_eventTableEntries[] = { \
#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, 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, 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, NULL },
#define EVT_LISTBOX_DCLICK(id, fn) { wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, 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, 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, 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, NULL },

22
include/wx/gdicmn.h
View File

@@ -112,19 +112,19 @@ class WXDLLEXPORT wxRect : public wxObject {
DECLARE_DYNAMIC_CLASS(wxRect) DECLARE_DYNAMIC_CLASS(wxRect)
public: public:
wxRect(void) ; wxRect(void) ;
wxRect(const long x, const long y, const long w, const long h); wxRect(long x, long y, long w, long h);
wxRect(const wxPoint& topLeft, const wxPoint& bottomRight); wxRect(const wxPoint& topLeft, const wxPoint& bottomRight);
wxRect(const wxPoint& pos, const wxSize& size); wxRect(const wxPoint& pos, const wxSize& size);
wxRect(const wxRect& rect); wxRect(const wxRect& rect);
inline long GetX(void) const { return x; } inline long GetX(void) const { return x; }
inline void SetX(const long X) { x = X; } inline void SetX(long X) { x = X; }
inline long GetY(void) const { return y; } inline long GetY(void) const { return y; }
inline void SetY(const long Y) { y = Y; } inline void SetY(long Y) { y = Y; }
inline long GetWidth() const { return width; } inline long GetWidth() const { return width; }
inline void SetWidth(const long w) { width = w; } inline void SetWidth(long w) { width = w; }
inline long GetHeight() const { return height; } inline long GetHeight() const { return height; }
inline void SetHeight(const long h) { height = h; } inline void SetHeight(long h) { height = h; }
inline wxPoint GetPosition(void) { return wxPoint(x, y); } inline wxPoint GetPosition(void) { return wxPoint(x, y); }
inline wxSize GetSize(void) { return wxSize(width, height); } inline wxSize GetSize(void) { return wxSize(width, height); }
@@ -189,8 +189,8 @@ class WXDLLEXPORT wxPenList: public wxList
~wxPenList(void); ~wxPenList(void);
void AddPen(wxPen *pen); void AddPen(wxPen *pen);
void RemovePen(wxPen *pen); void RemovePen(wxPen *pen);
wxPen *FindOrCreatePen(const wxColour& colour, const int width, const int style); wxPen *FindOrCreatePen(const wxColour& colour, int width, int style);
wxPen *FindOrCreatePen(const wxString& colour, const int width, const int style); wxPen *FindOrCreatePen(const wxString& colour, int width, int style);
}; };
class WXDLLEXPORT wxBrushList: public wxList class WXDLLEXPORT wxBrushList: public wxList
@@ -202,8 +202,8 @@ class WXDLLEXPORT wxBrushList: public wxList
~wxBrushList(void); ~wxBrushList(void);
void AddBrush(wxBrush *brush); void AddBrush(wxBrush *brush);
void RemoveBrush(wxBrush *brush); void RemoveBrush(wxBrush *brush);
wxBrush *FindOrCreateBrush(const wxColour& colour, const int style); wxBrush *FindOrCreateBrush(const wxColour& colour, int style);
wxBrush *FindOrCreateBrush(const wxString& colour, const int style); wxBrush *FindOrCreateBrush(const wxString& colour, int style);
}; };
WXDLLEXPORT_DATA(extern const char*) wxEmptyString; WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
@@ -217,8 +217,8 @@ class WXDLLEXPORT wxFontList: public wxList
~wxFontList(void); ~wxFontList(void);
void AddFont(wxFont *font); void AddFont(wxFont *font);
void RemoveFont(wxFont *font); void RemoveFont(wxFont *font);
wxFont *FindOrCreateFont(const int pointSize, const int family, const int style, const int weight, wxFont *FindOrCreateFont(int pointSize, int family, int style, int weight,
const bool underline = FALSE, const wxString& face = wxEmptyString); bool underline = FALSE, const wxString& face = wxEmptyString);
}; };
class WXDLLEXPORT wxColourDatabase: public wxList class WXDLLEXPORT wxColourDatabase: public wxList

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

@@ -29,13 +29,13 @@ 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,
const int n, const wxString *choices, char **clientData = NULL, long style = wxOK|wxCANCEL|wxCENTRE, const wxPoint& pos = wxDefaultPosition); int n, const wxString *choices, char **clientData = 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 = 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 int n, const wxString *choices, char **clientData = NULL, long style = wxOK|wxCANCEL|wxCENTRE, const wxPoint& pos = wxDefaultPosition); int n, const wxString *choices, char **clientData = 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 = NULL, long style = wxOK|wxCANCEL|wxCENTRE, const wxPoint& pos = wxDefaultPosition);
@@ -45,6 +45,7 @@ public:
inline char *GetSelectionClientData(void) const { return m_clientData; } inline char *GetSelectionClientData(void) const { return m_clientData; }
void OnOK(wxCommandEvent& event); void OnOK(wxCommandEvent& event);
void OnListBoxDClick(wxCommandEvent& event);
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
@@ -56,46 +57,46 @@ protected:
}; };
wxString WXDLLEXPORT wxGetSingleChoice(const wxString& message, const wxString& caption, wxString WXDLLEXPORT wxGetSingleChoice(const wxString& message, const wxString& caption,
const int n, const wxString *choices, wxWindow *parent = NULL, int n, const wxString *choices, wxWindow *parent = NULL,
const int x = -1, const int y = -1, const bool centre = TRUE, int x = -1, int y = -1, bool centre = TRUE,
const int width = wxCHOICE_WIDTH, const 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,
const int n, char *choices[], wxWindow *parent = NULL, int n, char *choices[], wxWindow *parent = NULL,
const int x = -1, const int y = -1, const bool centre = TRUE, int x = -1, int y = -1, bool centre = TRUE,
const int width = wxCHOICE_WIDTH, const 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,
const int n, const wxString *choices, wxWindow *parent = NULL, int n, const wxString *choices, wxWindow *parent = NULL,
const int x = -1, const int y = -1, const bool centre = TRUE, int x = -1, int y = -1, bool centre = TRUE,
const int width = wxCHOICE_WIDTH, const 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,
const int n, char *choices[], wxWindow *parent = NULL, int n, char *choices[], wxWindow *parent = NULL,
const int x = -1, const int y = -1, const bool centre = TRUE, int x = -1, int y = -1, bool centre = TRUE,
const int width = wxCHOICE_WIDTH, const 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,
const int n, const wxString *choices, char **client_data, int n, const wxString *choices, char **client_data,
wxWindow *parent = NULL, const int x = -1, const int y = -1, wxWindow *parent = NULL, int x = -1, int y = -1,
const bool centre = TRUE, bool centre = TRUE,
const int width = wxCHOICE_WIDTH, const 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,
const int n, char *choices[], char **client_data, int n, char *choices[], char **client_data,
wxWindow *parent = NULL, const int x = -1, const int y = -1, wxWindow *parent = NULL, int x = -1, int y = -1,
const bool centre = TRUE, bool centre = TRUE,
const int width = wxCHOICE_WIDTH, const int height = wxCHOICE_HEIGHT); int width = wxCHOICE_WIDTH, int height = wxCHOICE_HEIGHT);
/* /*
int WXDLLEXPORT wxGetMultipleChoice(const wxString& message, const wxString& caption, int WXDLLEXPORT wxGetMultipleChoice(const wxString& message, const wxString& caption,
const int n, const wxString *choices, int n, const wxString *choices,
const int nsel, int * selection, int nsel, int * selection,
wxWindow *parent = NULL, const int x = -1 , const int y = -1, const bool centre = TRUE, wxWindow *parent = NULL, int x = -1 , int y = -1, bool centre = TRUE,
const int width = wxCHOICE_WIDTH, const int height = wxCHOICE_HEIGHT); int width = wxCHOICE_WIDTH, int height = wxCHOICE_HEIGHT);
*/ */
#endif #endif

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

@@ -49,7 +49,7 @@ class WXDLLEXPORT wxGenericGrid: public wxPanel
public: public:
wxGenericGrid(void); wxGenericGrid(void);
inline wxGenericGrid(wxWindow *parent, int x, int y, int width, int height, const long style = 0, char *name = "grid") inline wxGenericGrid(wxWindow *parent, int x, int y, int width, int height, long style = 0, char *name = "grid")
{ {
Create(parent, -1, wxPoint(x, y), wxSize(width, height), style, name); Create(parent, -1, wxPoint(x, y), wxSize(width, height), style, name);
} }

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

@@ -57,7 +57,7 @@ class wxImageList: public wxObject
bool RemoveAll(); bool RemoveAll();
bool GetSize( int index, int &width, int &height ) const; bool GetSize( int index, int &width, int &height ) const;
bool Draw(int index, wxDC& dc, int x, int y, bool Draw(int index, wxDC& dc, int x, int y,
int flags = wxIMAGELIST_DRAW_NORMAL, const bool solidBackground = FALSE ); int flags = wxIMAGELIST_DRAW_NORMAL, bool solidBackground = FALSE );
private: private:

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

@@ -51,7 +51,7 @@ class wxListRenameTimer;
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// type of compare function for wxListCtrl sort operation // type of compare function for wxListCtrl sort operation
typedef int (*wxListCtrlCompare)(const long item1, const long item2, long sortData); typedef int (*wxListCtrlCompare)(long item1, long item2, long sortData);
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxListCtrl flags // wxListCtrl flags
@@ -252,14 +252,14 @@ class wxListItemData : public wxObject
wxListItemData( const wxListItem &info ); wxListItemData( const wxListItem &info );
void SetItem( const wxListItem &info ); void SetItem( const wxListItem &info );
void SetText( const wxString &s ); void SetText( const wxString &s );
void SetImage( const int image ); void SetImage( int image );
void SetData( const long data ); void SetData( long data );
void SetPosition( const int x, const int y ); void SetPosition( int x, int y );
void SetSize( const int width, const int height ); void SetSize( int width, int height );
void SetColour( wxColour *col ); void SetColour( wxColour *col );
bool HasImage(void) const; bool HasImage(void) const;
bool HasText(void) const; bool HasText(void) const;
bool IsHit( const int x, const int y ) const; bool IsHit( int x, int y ) const;
void GetText( wxString &s ); void GetText( wxString &s );
int GetX( void ) const; int GetX( void ) const;
int GetY( void ) const; int GetY( void ) const;
@@ -291,13 +291,13 @@ class wxListHeaderData : public wxObject
wxListHeaderData(void); wxListHeaderData(void);
wxListHeaderData( const wxListItem &info ); wxListHeaderData( const wxListItem &info );
void SetItem( const wxListItem &item ); void SetItem( const wxListItem &item );
void SetPosition( const int x, const int y ); void SetPosition( int x, int y );
void SetWidth( const int w ); void SetWidth( int w );
void SetFormat( const int format ); void SetFormat( int format );
void SetHeight( const int h ); void SetHeight( int h );
bool HasImage(void) const; bool HasImage(void) const;
bool HasText(void) const; bool HasText(void) const;
bool IsHit( const int x, const int y ) const; bool IsHit( int x, int y ) const;
void GetItem( wxListItem &item ); void GetItem( wxListItem &item );
void GetText( wxString &s ); void GetText( wxString &s );
int GetImage(void) const; int GetImage(void) const;
@@ -325,32 +325,32 @@ class wxListLineData : public wxObject
int m_spacing; int m_spacing;
wxListMainWindow *m_owner; wxListMainWindow *m_owner;
void DoDraw( wxPaintDC *dc, const bool hilight, const bool paintBG ); void DoDraw( wxPaintDC *dc, bool hilight, bool paintBG );
public: public:
wxListLineData( void ) {}; wxListLineData( void ) {};
wxListLineData( wxListMainWindow *owner, const int mode, wxBrush *hilightBrush ); wxListLineData( wxListMainWindow *owner, int mode, wxBrush *hilightBrush );
void CalculateSize( wxPaintDC *dc, const int spacing ); void CalculateSize( wxPaintDC *dc, int spacing );
void SetPosition( wxPaintDC *dc, const int x, const int y, const int window_width ); void SetPosition( wxPaintDC *dc, int x, int y, int window_width );
void SetColumnPosition( const int index, const int x ); void SetColumnPosition( int index, int x );
void GetSize( int &width, int &height ); void GetSize( int &width, int &height );
void GetExtent( int &x, int &y, int &width, int &height ); void GetExtent( int &x, int &y, int &width, int &height );
void GetLabelExtent( int &x, int &y, int &width, int &height ); void GetLabelExtent( int &x, int &y, int &width, int &height );
long IsHit( const int x, const int y ); long IsHit( int x, int y );
void InitItems( const int num ); void InitItems( int num );
void SetItem( const int index, const wxListItem &info ); void SetItem( int index, const wxListItem &info );
void GetItem( const int index, wxListItem &info ); void GetItem( int index, wxListItem &info );
void GetText( const int index, wxString &s ); void GetText( int index, wxString &s );
void SetText( const int index, const wxString s ); void SetText( int index, const wxString s );
int GetImage( const int index ); int GetImage( int index );
void GetRect( wxRectangle &rect ); void GetRect( wxRectangle &rect );
void Hilight( const bool on ); void Hilight( bool on );
void ReverseHilight( void ); void ReverseHilight( void );
void DrawRubberBand( wxPaintDC *dc, const bool on ); void DrawRubberBand( wxPaintDC *dc, bool on );
void Draw( wxPaintDC *dc ); void Draw( wxPaintDC *dc );
bool IsInRect( const int x, const int y, const wxRectangle &rect ); bool IsInRect( int x, int y, const wxRectangle &rect );
bool IsHilighted( void ); bool IsHilighted( void );
void AssignRect( wxRectangle &dest, const int x, const int y, const int width, const int height ); void AssignRect( wxRectangle &dest, int x, int y, int width, int height );
void AssignRect( wxRectangle &dest, const wxRectangle &source ); void AssignRect( wxRectangle &dest, const wxRectangle &source );
}; };
@@ -369,9 +369,9 @@ class wxListHeaderWindow : public wxWindow
public: public:
wxListHeaderWindow( void ); wxListHeaderWindow( void );
wxListHeaderWindow( wxWindow *win, const wxWindowID id, wxListMainWindow *owner, wxListHeaderWindow( wxWindow *win, wxWindowID id, wxListMainWindow *owner,
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
const long style = 0, const wxString &name = "columntitles" ); long style = 0, const wxString &name = "columntitles" );
void DoDrawRect( wxPaintDC *dc, int x, int y, int w, int h ); void DoDrawRect( wxPaintDC *dc, int x, int y, int w, int h );
void OnPaint( wxPaintEvent &event ); void OnPaint( wxPaintEvent &event );
void OnMouse( wxMouseEvent &event ); void OnMouse( wxMouseEvent &event );
@@ -487,13 +487,13 @@ class wxListMainWindow: public wxScrolledWindow
public: public:
wxListMainWindow(void); wxListMainWindow(void);
wxListMainWindow( wxWindow *parent, const wxWindowID id, wxListMainWindow( wxWindow *parent, wxWindowID id,
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
const long style = 0, const wxString &name = "listctrl" ); long style = 0, const wxString &name = "listctrl" );
~wxListMainWindow(void); ~wxListMainWindow(void);
void RefreshLine( wxListLineData *line ); void RefreshLine( wxListLineData *line );
void OnPaint( wxPaintEvent &event ); void OnPaint( wxPaintEvent &event );
void HilightAll( const bool on ); void HilightAll( bool on );
void ActivateLine( wxListLineData *line ); void ActivateLine( wxListLineData *line );
void SendNotify( wxListLineData *line, wxEventType command ); void SendNotify( wxListLineData *line, wxEventType command );
void FocusLine( wxListLineData *line ); void FocusLine( wxListLineData *line );
@@ -517,37 +517,37 @@ class wxListMainWindow: public wxScrolledWindow
int GetIndexOfLine( const wxListLineData *line ); int GetIndexOfLine( const wxListLineData *line );
int GetTextLength( wxString &s ); // should be const int GetTextLength( wxString &s ); // should be const
void SetImageList( wxImageList *imageList, const int which ); void SetImageList( wxImageList *imageList, int which );
void SetItemSpacing( const int spacing, const bool isSmall = FALSE ); void SetItemSpacing( int spacing, bool isSmall = FALSE );
int GetItemSpacing( const bool isSmall = FALSE ); int GetItemSpacing( bool isSmall = FALSE );
void SetColumn( const int col, wxListItem &item ); void SetColumn( int col, wxListItem &item );
void SetColumnWidth( const int col, const int width ); void SetColumnWidth( int col, int width );
void GetColumn( const int col, wxListItem &item ); void GetColumn( int col, wxListItem &item );
int GetColumnWidth( const int vol ); int GetColumnWidth( int vol );
int GetColumnCount( void ); int GetColumnCount( void );
int GetCountPerPage( void ); int GetCountPerPage( void );
void SetItem( wxListItem &item ); void SetItem( wxListItem &item );
void GetItem( wxListItem &item ); void GetItem( wxListItem &item );
void SetItemState( const long item, const long state, const long stateMask ); void SetItemState( long item, long state, long stateMask );
int GetItemState( const long item, const long stateMask ); int GetItemState( long item, long stateMask );
int GetItemCount( void ); int GetItemCount( void );
void GetItemRect( const long index, wxRectangle &rect ); void GetItemRect( long index, wxRectangle &rect );
int GetSelectedItemCount( void ); int GetSelectedItemCount( void );
void SetMode( const long mode ); void SetMode( long mode );
long GetMode( void ) const; long GetMode( void ) const;
void CalculatePositions( void ); void CalculatePositions( void );
void RealizeChanges(void); void RealizeChanges(void);
long GetNextItem( const long item, int geometry, int state ); long GetNextItem( long item, int geometry, int state );
void DeleteItem( const long index ); void DeleteItem( long index );
void DeleteAllItems( void ); void DeleteAllItems( void );
void DeleteColumn( const int col ); void DeleteColumn( int col );
void DeleteEverything( void ); void DeleteEverything( void );
void EnsureVisible( const long index ); void EnsureVisible( long index );
long FindItem(const long start, const wxString& str, const bool partial = FALSE ); long FindItem(long start, const wxString& str, bool partial = FALSE );
long FindItem(const long start, const long data); long FindItem(long start, long data);
long HitTest( const int x, const int y, int &flags ); long HitTest( int x, int y, int &flags );
void InsertItem( wxListItem &item ); void InsertItem( wxListItem &item );
void InsertColumn( const long col, wxListItem &item ); void InsertColumn( long col, wxListItem &item );
void SortItems( wxListCtrlCompare fn, long data ); void SortItems( wxListCtrlCompare fn, long data );
virtual bool OnListNotify( wxListEvent &event ); virtual bool OnListNotify( wxListEvent &event );
@@ -565,66 +565,66 @@ class wxListCtrl: public wxControl
public: public:
wxListCtrl(void); wxListCtrl(void);
wxListCtrl( wxWindow *parent, const wxWindowID id, wxListCtrl( wxWindow *parent, wxWindowID id,
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
const long style = 0, const wxString &name = "listctrl" ); long style = 0, const wxString &name = "listctrl" );
~wxListCtrl(void); ~wxListCtrl(void);
bool Create( wxWindow *parent, const wxWindowID id, bool Create( wxWindow *parent, wxWindowID id,
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
const long style = 0, const wxString &name = "listctrl" ); long style = 0, const wxString &name = "listctrl" );
void OnSize( wxSizeEvent &event ); void OnSize( wxSizeEvent &event );
void SetBackgroundColour( const wxColour& col ); void SetBackgroundColour( const wxColour& col );
bool GetColumn( const int col, wxListItem& item ); bool GetColumn( int col, wxListItem& item );
bool SetColumn( const int col, wxListItem& item ); bool SetColumn( int col, wxListItem& item );
int GetColumnWidth( const int col ); int GetColumnWidth( int col );
bool SetColumnWidth( const int col, const int width); bool SetColumnWidth( int col, int width);
int GetCountPerPage(void); // not the same in wxGLC as in Windows, I think int GetCountPerPage(void); // not the same in wxGLC as in Windows, I think
// wxText& GetEditControl(void) const; // not supported in wxGLC // wxText& GetEditControl(void) const; // not supported in wxGLC
bool GetItem( wxListItem& info ); bool GetItem( wxListItem& info );
bool SetItem( wxListItem& info ) ; bool SetItem( wxListItem& info ) ;
long SetItem( const long index, const int col, const wxString& label, const int imageId = -1 ); long SetItem( long index, int col, const wxString& label, int imageId = -1 );
int GetItemState( const long item, const long stateMask ); int GetItemState( long item, long stateMask );
bool SetItemState( const long item, const long state, const long stateMask); bool SetItemState( long item, long state, long stateMask);
bool SetItemImage( const long item, const int image, const int selImage); bool SetItemImage( long item, int image, int selImage);
wxString GetItemText( const long item ); wxString GetItemText( long item );
void SetItemText( const long item, const wxString& str ); void SetItemText( long item, const wxString& str );
long GetItemData( const long item ); long GetItemData( long item );
bool SetItemData( const long item, long data ); bool SetItemData( long item, long data );
bool GetItemRect( const long item, wxRectangle& rect, const int code = wxLIST_RECT_BOUNDS ); // not supported in wxGLC bool GetItemRect( long item, wxRectangle& rect, int code = wxLIST_RECT_BOUNDS ); // not supported in wxGLC
bool GetItemPosition( const long item, wxPoint& pos ) const; // not supported in wxGLC bool GetItemPosition( long item, wxPoint& pos ) const; // not supported in wxGLC
bool SetItemPosition( const long item, const wxPoint& pos ); // not supported in wxGLC bool SetItemPosition( long item, const wxPoint& pos ); // not supported in wxGLC
int GetItemCount(void); int GetItemCount(void);
int GetItemSpacing( bool isSmall ); int GetItemSpacing( bool isSmall );
int GetSelectedItemCount(void); int GetSelectedItemCount(void);
// wxColour GetTextColour(void) const; // wxGLC has colours for every Item (see wxListItem) // wxColour GetTextColour(void) const; // wxGLC has colours for every Item (see wxListItem)
// void SetTextColour(const wxColour& col); // void SetTextColour(const wxColour& col);
long GetTopItem(void); long GetTopItem(void);
void SetSingleStyle( const long style, const bool add = TRUE ) ; void SetSingleStyle( long style, bool add = TRUE ) ;
void SetWindowStyleFlag(const long style); void SetWindowStyleFlag(long style);
void RecreateWindow(void) {}; void RecreateWindow(void) {};
long GetNextItem(const long item, int geometry = wxLIST_NEXT_ALL, int state = wxLIST_STATE_DONTCARE); long GetNextItem(long item, int geometry = wxLIST_NEXT_ALL, int state = wxLIST_STATE_DONTCARE);
wxImageList *GetImageList(const int which); wxImageList *GetImageList(int which);
void SetImageList(wxImageList *imageList, const int which) ; void SetImageList(wxImageList *imageList, int which) ;
bool Arrange( const int flag = wxLIST_ALIGN_DEFAULT ); // always wxLIST_ALIGN_LEFT in wxGLC bool Arrange( int flag = wxLIST_ALIGN_DEFAULT ); // always wxLIST_ALIGN_LEFT in wxGLC
bool DeleteItem( const long item ); bool DeleteItem( long item );
bool DeleteAllItems(void) ; bool DeleteAllItems(void) ;
bool DeleteColumn( const int col ); bool DeleteColumn( int col );
// wxText& Edit(const long item) ; // not supported in wxGLC // wxText& Edit(long item) ; // not supported in wxGLC
bool EnsureVisible( const long item ); bool EnsureVisible( long item );
long FindItem(const long start, const wxString& str, const bool partial = FALSE ); long FindItem(long start, const wxString& str, bool partial = FALSE );
long FindItem(const long start, const long data); long FindItem(long start, long data);
long FindItem(const long start, const wxPoint& pt, const int direction); // not supported in wxGLC long FindItem(long start, const wxPoint& pt, int direction); // not supported in wxGLC
long HitTest(const wxPoint& point, int& flags); long HitTest(const wxPoint& point, int& flags);
long InsertItem(wxListItem& info); long InsertItem(wxListItem& info);
long InsertItem(const long index, const wxString& label); long InsertItem(long index, const wxString& label);
long InsertItem(const long index, const int imageIndex); long InsertItem(long index, int imageIndex);
long InsertItem(const long index, const wxString& label, const int imageIndex); long InsertItem(long index, const wxString& label, int imageIndex);
long InsertColumn(const long col, wxListItem& info); long InsertColumn(long col, wxListItem& info);
long InsertColumn(const long col, const wxString& heading, const int format = wxLIST_FORMAT_LEFT, long InsertColumn(long col, const wxString& heading, int format = wxLIST_FORMAT_LEFT,
const int width = -1); int width = -1);
bool ScrollList(const int dx, const int dy); bool ScrollList(int dx, int dy);
bool SortItems(wxListCtrlCompare fn, long data); bool SortItems(wxListCtrlCompare fn, long data);
bool Update(const long item); bool Update(long item);
virtual bool OnListNotify(wxListEvent& WXUNUSED(event)) { return FALSE; } virtual bool OnListNotify(wxListEvent& WXUNUSED(event)) { return FALSE; }
void SetDropTarget( wxDropTarget *dropTarget ) void SetDropTarget( wxDropTarget *dropTarget )
{ m_mainWin->SetDropTarget( dropTarget ); }; { m_mainWin->SetDropTarget( dropTarget ); };

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,
const long style = wxOK|wxCENTRE, wxWindow *parent = NULL, const int x = -1, const int y = -1); long style = wxOK|wxCENTRE, wxWindow *parent = NULL, int x = -1, int y = -1);
#endif #endif

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

@@ -30,27 +30,27 @@ public:
// Old-style constructor // Old-style constructor
inline wxPanel(wxWindow *parent, inline wxPanel(wxWindow *parent,
const int x = -1, const int y= -1, const int width = 500, const int height = 500, int x = -1, int y= -1, int width = 500, int height = 500,
const long style = wxTAB_TRAVERSAL | wxNO_BORDER, long style = wxTAB_TRAVERSAL | wxNO_BORDER,
const wxString& name = wxPanelNameStr) const wxString& name = wxPanelNameStr)
{ {
Create(parent, -1, wxPoint(x, y), wxSize(width, height), style, name); Create(parent, -1, wxPoint(x, y), wxSize(width, height), style, name);
} }
// Constructor // Constructor
inline wxPanel(wxWindow *parent, const wxWindowID id, inline wxPanel(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
const long style = wxTAB_TRAVERSAL | wxNO_BORDER, long style = wxTAB_TRAVERSAL | wxNO_BORDER,
const wxString& name = wxPanelNameStr) const wxString& name = wxPanelNameStr)
{ {
Create(parent, id, pos, size, style, name); Create(parent, id, pos, size, style, name);
} }
bool Create(wxWindow *parent, const wxWindowID id, bool Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
const long style = wxTAB_TRAVERSAL | wxNO_BORDER, long style = wxTAB_TRAVERSAL | wxNO_BORDER,
const wxString& name = wxPanelNameStr); const wxString& name = wxPanelNameStr);
void OnPaint(wxPaintEvent& event); void OnPaint(wxPaintEvent& event);

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

@@ -26,10 +26,10 @@ class WXDLLEXPORT wxScrolledWindow: public wxWindow
public: public:
wxScrolledWindow(void); wxScrolledWindow(void);
inline wxScrolledWindow(wxWindow *parent, const wxWindowID id = -1, inline wxScrolledWindow(wxWindow *parent, wxWindowID id = -1,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
const long style = wxHSCROLL|wxVSCROLL, long style = wxHSCROLL|wxVSCROLL,
const wxString& name = wxPanelNameStr) const wxString& name = wxPanelNameStr)
{ {
Create(parent, id, pos, size, style, name); Create(parent, id, pos, size, style, name);
@@ -37,15 +37,15 @@ public:
inline ~wxScrolledWindow(void) {} inline ~wxScrolledWindow(void) {}
bool Create(wxWindow *parent, const wxWindowID id, bool Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
const long style = wxHSCROLL|wxVSCROLL, long style = wxHSCROLL|wxVSCROLL,
const wxString& name = wxPanelNameStr); const wxString& name = wxPanelNameStr);
// Set client size // Set client size
// Should take account of scrollbars // Should take account of scrollbars
// virtual void SetClientSize(const int width, const int size); // virtual void SetClientSize(int width, int size);
// Is the window retained? // Is the window retained?
// inline bool IsRetained(void) const; // inline bool IsRetained(void) const;
@@ -53,13 +53,13 @@ public:
// Number of pixels per user unit (0 or -1 for no scrollbar) // Number of pixels per user unit (0 or -1 for no scrollbar)
// Length of virtual canvas in user units // Length of virtual canvas in user units
// Length of page in user units // Length of page in user units
virtual void SetScrollbars(const int pixelsPerUnitX, const int pixelsPerUnitY, virtual void SetScrollbars(int pixelsPerUnitX, int pixelsPerUnitY,
const int noUnitsX, const int noUnitsY, int noUnitsX, int noUnitsY,
const int xPos = 0, const int yPos = 0, int xPos = 0, int yPos = 0,
const bool noRefresh = FALSE ); bool noRefresh = FALSE );
// Physically scroll the window // Physically scroll the window
virtual void Scroll(const int x_pos, const int y_pos); virtual void Scroll(int x_pos, int y_pos);
#if WXWIN_COMPATIBILITY #if WXWIN_COMPATIBILITY
virtual void GetScrollUnitsPerPage(int *x_page, int *y_page) const; virtual void GetScrollUnitsPerPage(int *x_page, int *y_page) const;
@@ -75,7 +75,7 @@ public:
// If FALSE, the whole canvas is invalidated and a Clear() is // If FALSE, the whole canvas is invalidated and a Clear() is
// necessary. Disable for when the scroll increment is used // necessary. Disable for when the scroll increment is used
// to actually scroll a non-constant distance // to actually scroll a non-constant distance
virtual void EnableScrolling(const bool x_scrolling, const bool y_scrolling); virtual void EnableScrolling(bool x_scrolling, bool y_scrolling);
// Get the view start // Get the view start
virtual void ViewStart(int *x, int *y) const; virtual void ViewStart(int *x, int *y) const;
@@ -83,8 +83,8 @@ public:
// Actual size in pixels when scrolling is taken into account // Actual size in pixels when scrolling is taken into account
virtual void GetVirtualSize(int *x, int *y) const; virtual void GetVirtualSize(int *x, int *y) const;
virtual void CalcScrolledPosition(const int x, const int y, int *xx, int *yy) const ; virtual void CalcScrolledPosition(int x, int y, int *xx, int *yy) const ;
virtual void CalcUnscrolledPosition(const int x, const int y, float *xx, float *yy) const ; virtual void CalcUnscrolledPosition(int x, int y, float *xx, float *yy) const ;
// Adjust the scrollbars // Adjust the scrollbars
virtual void AdjustScrollbars(void); virtual void AdjustScrollbars(void);

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

@@ -57,8 +57,8 @@ class WXDLLEXPORT wxSplitterWindow: public wxWindow
wxSplitterWindow(void); wxSplitterWindow(void);
// Normal constructor // Normal constructor
wxSplitterWindow(wxWindow *parent, const wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, wxSplitterWindow(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const long style = wxSP_3D|wxCLIP_CHILDREN, const wxString& name = "splitter"); const wxSize& size = wxDefaultSize, long style = wxSP_3D|wxCLIP_CHILDREN, const wxString& name = "splitter");
~wxSplitterWindow(void); ~wxSplitterWindow(void);
// Gets the only or left/top pane // Gets the only or left/top pane
@@ -68,7 +68,7 @@ class WXDLLEXPORT wxSplitterWindow: public wxWindow
inline wxWindow *GetWindow2(void) { return m_windowTwo; } inline wxWindow *GetWindow2(void) { return m_windowTwo; }
// Sets the split mode // Sets the split mode
inline void SetSplitMode(const int mode) { m_splitMode = mode; } inline void SetSplitMode(int mode) { m_splitMode = mode; }
// Gets the split mode // Gets the split mode
inline int GetSplitMode(void) const { return m_splitMode; }; inline int GetSplitMode(void) const { return m_splitMode; };
@@ -80,8 +80,8 @@ class WXDLLEXPORT wxSplitterWindow: public wxWindow
// and changing the split mode. // and changing the split mode.
// Does nothing and returns FALSE if the window is already split. // Does nothing and returns FALSE if the window is already split.
// A sashPosition of -1 means choose a default sash position. // A sashPosition of -1 means choose a default sash position.
bool SplitVertically(wxWindow *window1, wxWindow *window2, const int sashPosition = -1); bool SplitVertically(wxWindow *window1, wxWindow *window2, int sashPosition = -1);
bool SplitHorizontally(wxWindow *window1, wxWindow *window2, const int sashPosition = -1); bool SplitHorizontally(wxWindow *window1, wxWindow *window2, int sashPosition = -1);
// 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.
@@ -91,10 +91,10 @@ class WXDLLEXPORT wxSplitterWindow: public wxWindow
inline bool IsSplit(void) const { return (m_windowTwo != NULL); } inline bool IsSplit(void) const { return (m_windowTwo != NULL); }
// Sets the sash size // Sets the sash size
inline void SetSashSize(const int width) { m_sashSize = width; } inline void SetSashSize(int width) { m_sashSize = width; }
// Sets the border size // Sets the border size
inline void SetBorderSize(const int width) { m_borderSize = width; } inline void SetBorderSize(int width) { m_borderSize = width; }
// Gets the sash size // Gets the sash size
inline int GetSashSize(void) const { return m_sashSize; } inline int GetSashSize(void) const { return m_sashSize; }
@@ -103,13 +103,13 @@ class WXDLLEXPORT wxSplitterWindow: public wxWindow
inline int GetBorderSize(void) const { return m_borderSize; } inline int GetBorderSize(void) const { return m_borderSize; }
// Set the sash position // Set the sash position
void SetSashPosition(const int position, const bool redaw = TRUE); void SetSashPosition(int position, bool redaw = TRUE);
// Gets the sash position // Gets the sash position
inline int GetSashPosition(void) const { return m_sashPosition; } inline int GetSashPosition(void) const { return m_sashPosition; }
// If this is zero, we can remove panes by dragging the sash. // If this is zero, we can remove panes by dragging the sash.
inline void SetMinimumPaneSize(const int min) { m_minimumPaneSize = min; } inline void SetMinimumPaneSize(int min) { m_minimumPaneSize = min; }
inline int GetMinimumPaneSize(void) const { return m_minimumPaneSize; } inline int GetMinimumPaneSize(void) const { return m_minimumPaneSize; }
// If the sash is moved to an extreme position, a subwindow // If the sash is moved to an extreme position, a subwindow
@@ -141,10 +141,10 @@ class WXDLLEXPORT wxSplitterWindow: public wxWindow
void DrawSash(wxDC& dc); void DrawSash(wxDC& dc);
// Draws the sash tracker (for whilst moving the sash) // Draws the sash tracker (for whilst moving the sash)
void DrawSashTracker(const int x, const int y); void DrawSashTracker(int x, int y);
// Tests for x, y over sash // Tests for x, y over sash
bool SashHitTest(const int x, const int y, const int tolerance = 2); bool SashHitTest(int x, int y, int tolerance = 2);
// Resizes subwindows // Resizes subwindows
void SizeWindows(void); void SizeWindows(void);

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

@@ -26,10 +26,10 @@ class WXDLLEXPORT wxStatusBar: public wxWindow
public: public:
wxStatusBar(void); wxStatusBar(void);
inline wxStatusBar(wxWindow *parent, const wxWindowID id, inline wxStatusBar(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
const long style = 0, long style = 0,
const wxString& name = wxPanelNameStr) const wxString& name = wxPanelNameStr)
{ {
Create(parent, id, pos, size, style, name); Create(parent, id, pos, size, style, name);
@@ -37,33 +37,33 @@ public:
~wxStatusBar(void); ~wxStatusBar(void);
bool Create(wxWindow *parent, const wxWindowID id, bool Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
const long style = 0, long style = 0,
const wxString& name = wxPanelNameStr); const wxString& name = wxPanelNameStr);
// Create status line // Create status line
virtual void SetFieldsCount(const int number=1, const int *widths = NULL); virtual void SetFieldsCount(int number=1, int *widths = NULL);
inline int GetFieldsCount(void) const { return m_nFields; } inline int GetFieldsCount(void) const { return m_nFields; }
// Set status line text // Set status line text
virtual void SetStatusText(const wxString& text, const int number = 0); virtual void SetStatusText(const wxString& text, int number = 0);
virtual wxString GetStatusText(const int number = 0) const; virtual wxString GetStatusText(int number = 0) const;
// Set status line widths // Set status line widths
virtual void SetStatusWidths(const int n, const int *widths_field); virtual void SetStatusWidths(int n, int *widths_field);
virtual void DrawFieldText(wxDC& dc, const int i); virtual void DrawFieldText(wxDC& dc, int i);
virtual void DrawField(wxDC& dc, const int i); virtual void DrawField(wxDC& dc, int i);
// Get the position and size of the field's internal bounding rectangle // Get the position and size of the field's internal bounding rectangle
virtual bool GetFieldRect(const int i, wxRectangle& rect) const; virtual bool GetFieldRect(int i, wxRectangle& rect) const;
inline int GetBorderX(void) const { return m_borderX; } inline int GetBorderX(void) const { return m_borderX; }
inline int GetBorderY(void) const { return m_borderY; } inline int GetBorderY(void) const { return m_borderY; }
inline void SetBorderX(const int x); inline void SetBorderX(int x);
inline void SetBorderY(const int y); inline void SetBorderY(int y);
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
// Implementation // Implementation

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

@@ -266,10 +266,10 @@ DECLARE_DYNAMIC_CLASS(wxTabbedDialog)
public: public:
wxTabbedDialog(wxWindow *parent, const wxWindowID id, const wxString& title, wxTabbedDialog(wxWindow *parent, wxWindowID id, const wxString& title,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
const long windowStyle = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxDialogNameStr); long windowStyle = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxDialogNameStr);
~wxTabbedDialog(void); ~wxTabbedDialog(void);
inline wxTabView *GetTabView() const { return m_tabView; } inline wxTabView *GetTabView() const { return m_tabView; }
@@ -295,10 +295,10 @@ DECLARE_DYNAMIC_CLASS(wxTabbedPanel)
public: public:
wxTabbedPanel(wxWindow *parent, const wxWindowID id, wxTabbedPanel(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
const long windowStyle = 0, const wxString& name = wxPanelNameStr); long windowStyle = 0, const wxString& name = wxPanelNameStr);
~wxTabbedPanel(void); ~wxTabbedPanel(void);
inline wxTabView *GetTabView() const { return m_tabView; } inline wxTabView *GetTabView() const { return m_tabView; }

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

@@ -257,24 +257,24 @@ class wxTreeCtrl: public wxScrolledWindow
public: public:
wxTreeCtrl(void); wxTreeCtrl(void);
wxTreeCtrl(wxWindow *parent, const wxWindowID id = -1, wxTreeCtrl(wxWindow *parent, wxWindowID id = -1,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxTR_HAS_BUTTONS, long style = wxTR_HAS_BUTTONS,
const wxString& name = "wxTreeCtrl" ); const wxString& name = "wxTreeCtrl" );
~wxTreeCtrl(void); ~wxTreeCtrl(void);
bool Create(wxWindow *parent, const wxWindowID id = -1, bool Create(wxWindow *parent, wxWindowID id = -1,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxTR_HAS_BUTTONS, long style = wxTR_HAS_BUTTONS,
const wxString& name = "wxTreeCtrl"); const wxString& name = "wxTreeCtrl");
int GetCount(void) const; int GetCount(void) const;
long InsertItem( long parent, const wxString& label, const int image = -1, long InsertItem( long parent, const wxString& label, int image = -1,
const int selImage = -1, long insertAfter = wxTREE_INSERT_LAST ); int selImage = -1, long insertAfter = wxTREE_INSERT_LAST );
long InsertItem( long parent, wxTreeItem &info, long insertAfter = wxTREE_INSERT_LAST ); long InsertItem( long parent, wxTreeItem &info, long insertAfter = wxTREE_INSERT_LAST );
bool DeleteAllItems(void); bool DeleteAllItems(void);
bool ExpandItem( long item, const int action ); bool ExpandItem( long item, int action );
bool GetItem( wxTreeItem &info ) const; bool GetItem( wxTreeItem &info ) const;
long GetItemData( long item ) const; long GetItemData( long item ) const;
wxString GetItemText( long item ) const; wxString GetItemText( long item ) const;
@@ -284,7 +284,7 @@ class wxTreeCtrl: public wxScrolledWindow
long GetSelection(void) const; long GetSelection(void) const;
bool SelectItem( long item ) const; bool SelectItem( long item ) const;
bool ItemHasChildren( long item ) const; bool ItemHasChildren( long item ) const;
void SetIndent( const int indent ); void SetIndent( int indent );
int GetIndent(void) const; int GetIndent(void) const;
bool SetItem( wxTreeItem &info ); bool SetItem( wxTreeItem &info );
bool SetItemData( long item, long data ); bool SetItemData( long item, long data );

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

@@ -47,7 +47,7 @@ class wxMask: public wxObject
wxMask(void); wxMask(void);
wxMask( const wxBitmap& bitmap, const wxColour& colour ); wxMask( const wxBitmap& bitmap, const wxColour& colour );
wxMask( const wxBitmap& bitmap, const int paletteIndex ); wxMask( const wxBitmap& bitmap, int paletteIndex );
wxMask( const wxBitmap& bitmap ); wxMask( const wxBitmap& bitmap );
~wxMask(void); ~wxMask(void);
@@ -80,12 +80,12 @@ class wxBitmap: public wxObject
public: public:
wxBitmap(void); wxBitmap(void);
wxBitmap( const int width, const int height, const int depth = -1 ); wxBitmap( int width, int height, int depth = -1 );
wxBitmap( const char bits[], const int width, const int height, const int depth = 1 ); wxBitmap( const char bits[], int width, int height, int depth = 1 );
wxBitmap( char **bits ); wxBitmap( char **bits );
wxBitmap( const wxBitmap& bmp ); wxBitmap( const wxBitmap& bmp );
wxBitmap( const wxBitmap* bmp ); wxBitmap( const wxBitmap* bmp );
wxBitmap( const wxString &filename, const int type ); wxBitmap( const wxString &filename, int type );
~wxBitmap(void); ~wxBitmap(void);
wxBitmap& operator = ( const wxBitmap& bmp ); wxBitmap& operator = ( const wxBitmap& bmp );
bool operator == ( const wxBitmap& bmp ); bool operator == ( const wxBitmap& bmp );
@@ -95,15 +95,15 @@ class wxBitmap: public wxObject
int GetHeight(void) const; int GetHeight(void) const;
int GetWidth(void) const; int GetWidth(void) const;
int GetDepth(void) const; int GetDepth(void) const;
void SetHeight( const int height ); void SetHeight( int height );
void SetWidth( const int width ); void SetWidth( int width );
void SetDepth( const int depth ); void SetDepth( int depth );
wxMask *GetMask(void) const; wxMask *GetMask(void) const;
void SetMask( wxMask *mask ); void SetMask( wxMask *mask );
bool SaveFile( const wxString &name, const int type, wxPalette *palette = NULL ); bool SaveFile( const wxString &name, int type, wxPalette *palette = NULL );
bool LoadFile( const wxString &name, const int type ); bool LoadFile( const wxString &name, int type );
wxPalette *GetPalette(void) const; wxPalette *GetPalette(void) const;
wxPalette *GetColourMap(void) const wxPalette *GetColourMap(void) const

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

@@ -46,10 +46,10 @@ class wxBitmapButton: public wxControl
wxBitmapButton(void); wxBitmapButton(void);
wxBitmapButton( wxWindow *parent, wxWindowID id, const wxBitmap &bitmap, wxBitmapButton( wxWindow *parent, wxWindowID id, const wxBitmap &bitmap,
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
const long style = 0, const wxString &name = wxButtonNameStr ); long style = 0, const wxString &name = wxButtonNameStr );
bool Create( wxWindow *parent, wxWindowID id, const wxBitmap &bitmap, bool Create( wxWindow *parent, wxWindowID id, const wxBitmap &bitmap,
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
const long style = 0, const wxString &name = wxButtonNameStr ); long style = 0, const wxString &name = wxButtonNameStr );
void SetDefault(void); void SetDefault(void);
void SetLabel( const wxString &label ); void SetLabel( const wxString &label );
wxString GetLabel(void) const; wxString GetLabel(void) const;

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

@@ -39,8 +39,8 @@ class wxBrush: public wxGDIObject
public: public:
wxBrush(void); wxBrush(void);
wxBrush( const wxColour &colour, const int style ); wxBrush( const wxColour &colour, int style );
wxBrush( const wxString &colourName, const int style ); wxBrush( const wxString &colourName, int style );
wxBrush( const wxBitmap &stippleBitmap ); wxBrush( const wxBitmap &stippleBitmap );
wxBrush( const wxBrush &brush ); wxBrush( const wxBrush &brush );
wxBrush( const wxBrush *brush ); wxBrush( const wxBrush *brush );

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

@@ -46,10 +46,10 @@ class wxButton: public wxControl
wxButton(void); wxButton(void);
wxButton( wxWindow *parent, wxWindowID id, const wxString &label, wxButton( wxWindow *parent, wxWindowID id, const wxString &label,
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
const long style = 0, const wxString &name = wxButtonNameStr ); long style = 0, const wxString &name = wxButtonNameStr );
bool Create( wxWindow *parent, wxWindowID id, const wxString &label, bool Create( wxWindow *parent, wxWindowID id, const wxString &label,
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
const long style = 0, const wxString &name = wxButtonNameStr ); long style = 0, const wxString &name = wxButtonNameStr );
void SetDefault(void); void SetDefault(void);
void SetLabel( const wxString &label ); void SetLabel( const wxString &label );
wxString GetLabel(void) const; wxString GetLabel(void) const;

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

@@ -46,11 +46,11 @@ class wxCheckBox: public wxControl
wxCheckBox(void); wxCheckBox(void);
wxCheckBox( wxWindow *parent, wxWindowID id, const wxString &label, wxCheckBox( wxWindow *parent, wxWindowID id, const wxString &label,
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
const long style = 0, const wxString &name = wxCheckBoxNameStr ); long style = 0, const wxString &name = wxCheckBoxNameStr );
bool Create( wxWindow *parent, wxWindowID id, const wxString &label, bool Create( wxWindow *parent, wxWindowID id, const wxString &label,
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
const long style = 0, const wxString &name = wxCheckBoxNameStr ); long style = 0, const wxString &name = wxCheckBoxNameStr );
void SetValue( const bool state ); void SetValue( bool state );
bool GetValue(void) const; bool GetValue(void) const;
}; };

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

@@ -44,24 +44,24 @@ class wxChoice: public wxControl
public: public:
wxChoice(void); wxChoice(void);
wxChoice( wxWindow *parent, const wxWindowID id, wxChoice( wxWindow *parent, wxWindowID id,
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
const int n = 0, const wxString choices[] = NULL, int n = 0, const wxString choices[] = NULL,
const long style = 0, const wxString &name = wxChoiceNameStr ); long style = 0, const wxString &name = wxChoiceNameStr );
bool Create( wxWindow *parent, const wxWindowID id, bool Create( wxWindow *parent, wxWindowID id,
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
const int n = 0, const wxString choices[] = NULL, int n = 0, const wxString choices[] = NULL,
const long style = 0, const wxString &name = wxChoiceNameStr ); long style = 0, const wxString &name = wxChoiceNameStr );
void Append( const wxString &item ); void Append( const wxString &item );
void Clear(void); void Clear(void);
int FindString( const wxString &string ) const; int FindString( const wxString &string ) const;
int GetColumns(void) const; int GetColumns(void) const;
int GetSelection(void); int GetSelection(void);
wxString GetString( const int n ) const; wxString GetString( int n ) const;
wxString GetStringSelection(void) const; wxString GetStringSelection(void) const;
int Number(void) const; int Number(void) const;
void SetColumns( const int n = 1 ); void SetColumns( int n = 1 );
void SetSelection( const int n ); void SetSelection( int n );
void SetStringSelection( const wxString &string ); void SetStringSelection( const wxString &string );
}; };

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

@@ -44,38 +44,38 @@ class wxComboBox: public wxControl
public: public:
inline wxComboBox(void) {} inline wxComboBox(void) {}
inline wxComboBox(wxWindow *parent, const wxWindowID id, inline wxComboBox(wxWindow *parent, wxWindowID id,
const wxString& value = wxEmptyString, const wxString& value = wxEmptyString,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
const int n = 0, const wxString choices[] = NULL, int n = 0, const wxString choices[] = NULL,
const long style = 0, long style = 0,
const wxString& name = wxComboBoxNameStr) const wxString& name = wxComboBoxNameStr)
{ {
Create(parent, id, value, pos, size, n, choices, style, name); Create(parent, id, value, pos, size, n, choices, style, name);
} }
bool Create(wxWindow *parent, const wxWindowID id, bool Create(wxWindow *parent, wxWindowID id,
const wxString& value = wxEmptyString, const wxString& value = wxEmptyString,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
const int n = 0, const wxString choices[] = NULL, int n = 0, const wxString choices[] = NULL,
const long style = 0, long style = 0,
const wxString& name = wxComboBoxNameStr); const wxString& name = wxComboBoxNameStr);
// List functions // List functions
void Clear(void); void Clear(void);
void Append( const wxString &item ); void Append( const wxString &item );
void Append( const wxString &item, char* clientData ); void Append( const wxString &item, char* clientData );
void Delete( const int n ); void Delete( int n );
int FindString( const wxString &item ); int FindString( const wxString &item );
char* GetClientData( const int n ); char* GetClientData( int n );
void SetClientData( const int n, char * clientData ); void SetClientData( int n, char * clientData );
int GetSelection(void) const; int GetSelection(void) const;
wxString GetString( const int n ) const; wxString GetString( int n ) const;
wxString GetStringSelection(void) const; wxString GetStringSelection(void) const;
int Number(void) const; int Number(void) const;
void SetSelection( const int n ); void SetSelection( int n );
// Text field functions // Text field functions
wxString GetValue(void) const ; wxString GetValue(void) const ;
@@ -85,14 +85,14 @@ class wxComboBox: public wxControl
void Copy(void); void Copy(void);
void Cut(void); void Cut(void);
void Paste(void); void Paste(void);
void SetInsertionPoint(const long pos); void SetInsertionPoint(long pos);
void SetInsertionPointEnd(void); void SetInsertionPointEnd(void);
long GetInsertionPoint(void) const ; long GetInsertionPoint(void) const ;
long GetLastPosition(void) const ; long GetLastPosition(void) const ;
void Replace(const long from, const long to, const wxString& value); void Replace(long from, long to, const wxString& value);
void Remove(const long from, const long to); void Remove(long from, long to);
void SetSelection(const long from, const long to); void SetSelection(long from, long to);
void SetEditable(const bool editable); void SetEditable(bool editable);
private: private:

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

@@ -40,7 +40,7 @@ class wxControl: public wxWindow
wxControl(void); wxControl(void);
wxControl( wxWindow *parent, wxWindowID id, wxControl( wxWindow *parent, wxWindowID id,
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
const long style = 0, const wxString &name = wxPanelNameStr ); long style = 0, const wxString &name = wxPanelNameStr );
virtual void Command( wxCommandEvent &event ); virtual void Command( wxCommandEvent &event );
virtual void SetLabel( const wxString &label ); virtual void SetLabel( const wxString &label );
virtual wxString GetLabel(void) const; virtual wxString GetLabel(void) const;

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

@@ -39,7 +39,7 @@ class wxCursor: public wxObject
public: public:
wxCursor(void); wxCursor(void);
wxCursor( const int cursorId ); wxCursor( int cursorId );
wxCursor( const wxCursor &cursor ); wxCursor( const wxCursor &cursor );
wxCursor( const wxCursor *cursor ); wxCursor( const wxCursor *cursor );
~wxCursor(void); ~wxCursor(void);

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

@@ -53,10 +53,10 @@ class wxDialog: public wxWindow
wxDialog(void); wxDialog(void);
wxDialog( wxWindow *parent, wxWindowID id, const wxString &title, wxDialog( wxWindow *parent, wxWindowID id, const wxString &title,
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
const long style = wxDEFAULT_DIALOG_STYLE, const wxString &name = wxDialogNameStr ); long style = wxDEFAULT_DIALOG_STYLE, const wxString &name = wxDialogNameStr );
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,
const long style = wxDEFAULT_DIALOG_STYLE, const wxString &name = wxDialogNameStr ); long style = wxDEFAULT_DIALOG_STYLE, const wxString &name = wxDialogNameStr );
~wxDialog(void); ~wxDialog(void);
void SetTitle(const wxString& title); void SetTitle(const wxString& title);
wxString GetTitle(void) const; wxString GetTitle(void) const;
@@ -69,7 +69,7 @@ class wxDialog: public wxWindow
/* /*
void OnCharHook(wxKeyEvent& event); void OnCharHook(wxKeyEvent& event);
*/ */
virtual bool Show( const bool show ); virtual bool Show( bool show );
virtual int ShowModal(void); virtual int ShowModal(void);
virtual void EndModal(int retCode); virtual void EndModal(int retCode);
virtual bool IsModal(void) const { return ((GetWindowStyleFlag() & wxDIALOG_MODAL) == wxDIALOG_MODAL); } virtual bool IsModal(void) const { return ((GetWindowStyleFlag() & wxDIALOG_MODAL) == wxDIALOG_MODAL); }

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

@@ -76,7 +76,7 @@ class wxDragSource: public wxObject
wxDragSource( wxWindow *win ); wxDragSource( wxWindow *win );
~wxDragSource(void); ~wxDragSource(void);
void SetData( char *data, const long size ); void SetData( char *data, long size );
void Start( int x, int y ); void Start( int x, int y );
public: public:

18
include/wx/gtk/frame.h
View File

@@ -47,23 +47,23 @@ class wxFrame: public wxWindow
public: public:
wxFrame(void); wxFrame(void);
wxFrame( wxWindow *parent, const wxWindowID id, const wxString &title, wxFrame( wxWindow *parent, wxWindowID id, const wxString &title,
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
const long style = wxDEFAULT_FRAME_STYLE, const wxString &name = wxFrameNameStr ); long style = wxDEFAULT_FRAME_STYLE, const wxString &name = wxFrameNameStr );
bool Create( wxWindow *parent, const 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,
const long style = wxDEFAULT_FRAME_STYLE, const wxString &name = wxFrameNameStr ); long style = wxDEFAULT_FRAME_STYLE, const wxString &name = wxFrameNameStr );
~wxFrame(void); ~wxFrame(void);
bool Destroy(void); bool Destroy(void);
void OnCloseWindow( wxCloseEvent& event ); void OnCloseWindow( wxCloseEvent& event );
virtual bool Show( const bool show ); virtual bool Show( bool show );
virtual void Enable( const bool enable ); virtual void Enable( bool enable );
virtual void GetClientSize( int *width, int *height ) const; virtual void GetClientSize( int *width, int *height ) const;
void OnSize( wxSizeEvent &event ); void OnSize( wxSizeEvent &event );
void SetMenuBar( wxMenuBar *menuBar ); void SetMenuBar( wxMenuBar *menuBar );
virtual bool CreateStatusBar( const int number = 1 ); virtual bool CreateStatusBar( int number = 1 );
virtual void SetStatusText( const wxString &text, const int number = 0 ); virtual void SetStatusText( const wxString &text, int number = 0 );
virtual void SetStatusWidths( const int n, const int *width ); virtual void SetStatusWidths( int n, int *width );
wxStatusBar *GetStatusBar(void); wxStatusBar *GetStatusBar(void);
wxMenuBar *GetMenuBar(void); wxMenuBar *GetMenuBar(void);
void SetTitle( const wxString &title ); void SetTitle( const wxString &title );

20
include/wx/gtk/gauge.h
View File

@@ -44,27 +44,27 @@ class wxGauge: public wxControl
public: public:
inline wxGauge(void) { m_rangeMax = 0; m_gaugePos = 0; m_useProgressBar = TRUE; } inline wxGauge(void) { m_rangeMax = 0; m_gaugePos = 0; m_useProgressBar = TRUE; }
inline wxGauge(wxWindow *parent, const wxWindowID id, inline wxGauge(wxWindow *parent, wxWindowID id,
const int range, int range,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
const long style = wxGA_HORIZONTAL, long style = wxGA_HORIZONTAL,
const wxString& name = wxGaugeNameStr) const wxString& name = wxGaugeNameStr)
{ {
Create(parent, id, range, pos, size, style, name); Create(parent, id, range, pos, size, style, name);
}; };
bool Create(wxWindow *parent, const wxWindowID id, bool Create(wxWindow *parent, wxWindowID id,
const int range, int range,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
const long style = wxGA_HORIZONTAL, long style = wxGA_HORIZONTAL,
const wxString& name = wxGaugeNameStr ); const wxString& name = wxGaugeNameStr );
void SetShadowWidth( const int WXUNUSED(w) ) {}; void SetShadowWidth( int WXUNUSED(w) ) {};
void SetBezelFace( const int WXUNUSED(w) ) {}; void SetBezelFace( int WXUNUSED(w) ) {};
void SetRange( const int r ); void SetRange( int r );
void SetValue( const int pos ); void SetValue( int pos );
int GetShadowWidth(void) const { return 0; }; int GetShadowWidth(void) const { return 0; };
int GetBezelFace(void) const { return 0; }; int GetBezelFace(void) const { return 0; };
int GetRange(void) const; int GetRange(void) const;

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

@@ -41,7 +41,7 @@ public:
inline wxIcon(const wxIcon& icon) { Ref(icon); } inline wxIcon(const wxIcon& icon) { Ref(icon); }
inline wxIcon(const wxIcon* icon) { if (icon) Ref(*icon); } inline wxIcon(const wxIcon* icon) { if (icon) Ref(*icon); }
wxIcon( char **bits, const int width = -1, const int height = -1 ) : wxIcon( char **bits, int width = -1, int height = -1 ) :
wxBitmap( bits ) {}; wxBitmap( bits ) {};
inline wxIcon& operator = (const wxIcon& icon) { if (*this == icon) return (*this); Ref(icon); return *this; } inline wxIcon& operator = (const wxIcon& icon) { if (*this == icon) return (*this); Ref(icon); return *this; }

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

@@ -46,32 +46,32 @@ class wxListBox: public wxControl
wxListBox(void); wxListBox(void);
wxListBox( wxWindow *parent, wxWindowID id, wxListBox( wxWindow *parent, wxWindowID id,
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
const int n = 0, const wxString choices[] = NULL, int n = 0, const wxString choices[] = NULL,
const long style = 0, const wxString &name = wxListBoxNameStr ); long style = 0, const wxString &name = wxListBoxNameStr );
bool Create( wxWindow *parent, wxWindowID id, bool Create( wxWindow *parent, wxWindowID id,
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
const int n = 0, const wxString choices[] = NULL, int n = 0, const wxString choices[] = NULL,
const long style = 0, const wxString &name = wxListBoxNameStr ); long style = 0, const wxString &name = wxListBoxNameStr );
void Append( const wxString &item ); void Append( const wxString &item );
void Append( const wxString &item, char *clientData ); void Append( const wxString &item, char *clientData );
void Clear(void); void Clear(void);
void Delete( int n ); void Delete( int n );
void Deselect( int n ); void Deselect( int n );
int FindString( const wxString &item ) const; int FindString( const wxString &item ) const;
char *GetClientData( const int n ) const; char *GetClientData( int n ) const;
int GetSelection(void) const; int GetSelection(void) const;
int GetSelections( class wxArrayInt &) const; int GetSelections( class wxArrayInt &) const;
wxString GetString( int n ) const; wxString GetString( int n ) const;
wxString GetStringSelection(void) const; wxString GetStringSelection(void) const;
int Number(void); int Number(void);
bool Selected( const int n ); bool Selected( int n );
void Set( const int n, const wxString *choices ); void Set( int n, const wxString *choices );
void SetClientData( const int n, char *clientData ); void SetClientData( int n, char *clientData );
void SetFirstItem( int n ); void SetFirstItem( int n );
void SetFirstItem( const wxString &item ); void SetFirstItem( const wxString &item );
void SetSelection( const int n, const bool select = TRUE ); void SetSelection( int n, bool select = TRUE );
void SetString( const int n, const wxString &string ); void SetString( int n, const wxString &string );
void SetStringSelection( const wxString &string, const bool select = TRUE ); void SetStringSelection( const wxString &string, bool select = TRUE );
private: private:

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

@@ -52,15 +52,15 @@ class wxMDIParentFrame: public wxFrame
wxMDIParentFrame(void); wxMDIParentFrame(void);
wxMDIParentFrame( wxWindow *parent, wxMDIParentFrame( wxWindow *parent,
const wxWindowID id, const wxString& title, wxWindowID id, const wxString& title,
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
const long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL, long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
const wxString& name = wxFrameNameStr ); const wxString& name = wxFrameNameStr );
~wxMDIParentFrame(void); ~wxMDIParentFrame(void);
bool Create( wxWindow *parent, bool Create( wxWindow *parent,
const wxWindowID id, const wxString& title, wxWindowID id, const wxString& title,
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
const long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL, long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
const wxString& name = wxFrameNameStr ); const wxString& name = wxFrameNameStr );
void OnSize( wxSizeEvent& event ); void OnSize( wxSizeEvent& event );
@@ -101,20 +101,20 @@ class wxMDIChildFrame: public wxPanel
wxMDIChildFrame(void); wxMDIChildFrame(void);
wxMDIChildFrame( wxMDIParentFrame *parent, wxMDIChildFrame( wxMDIParentFrame *parent,
const wxWindowID id, const wxString& title, wxWindowID id, const wxString& title,
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
const long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxFrameNameStr ); long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxFrameNameStr );
~wxMDIChildFrame(void); ~wxMDIChildFrame(void);
bool Create( wxMDIParentFrame *parent, bool Create( wxMDIParentFrame *parent,
const wxWindowID id, const wxString& title, wxWindowID id, const wxString& title,
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
const long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxFrameNameStr ); long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxFrameNameStr );
void SetMenuBar( wxMenuBar *menu_bar ); void SetMenuBar( wxMenuBar *menu_bar );
// no status bars in wxGTK // no status bars in wxGTK
virtual bool CreateStatusBar( const int WXUNUSED(number) = 1 ) { return FALSE; }; virtual bool CreateStatusBar( int WXUNUSED(number) = 1 ) { return FALSE; };
virtual void SetStatusText( const wxString &WXUNUSED(text), const int WXUNUSED(number) ) {}; virtual void SetStatusText( const wxString &WXUNUSED(text), int WXUNUSED(number) ) {};
virtual void SetStatusWidths( const int WXUNUSED(n), const int *WXUNUSED(width) ) {}; virtual void SetStatusWidths( int WXUNUSED(n), int *WXUNUSED(width) ) {};
virtual void Maximize(void) {}; virtual void Maximize(void) {};
virtual void Restore(void) {}; virtual void Restore(void) {};
@@ -136,9 +136,9 @@ class wxMDIClientWindow: public wxWindow
public: public:
wxMDIClientWindow(void); wxMDIClientWindow(void);
wxMDIClientWindow( wxMDIParentFrame *parent, const long style = 0 ); wxMDIClientWindow( wxMDIParentFrame *parent, long style = 0 );
~wxMDIClientWindow(void); ~wxMDIClientWindow(void);
virtual bool CreateClient( wxMDIParentFrame *parent, const long style = wxVSCROLL | wxHSCROLL ); virtual bool CreateClient( wxMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL );
void AddChild( wxWindow *child ); void AddChild( wxWindow *child );
}; };

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

@@ -80,15 +80,15 @@ class wxMenu: public wxEvtHandler
wxMenu( const wxString &title = "" ); wxMenu( const wxString &title = "" );
void AppendSeparator(void); void AppendSeparator(void);
void Append( const int id, const wxString &item, void Append( int id, const wxString &item,
const wxString &helpStr = "", const bool checkable = FALSE ); const wxString &helpStr = "", bool checkable = FALSE );
void Append( const int id, const wxString &item, void Append( int id, const wxString &item,
wxMenu *subMenu, const wxString &helpStr = "" ); wxMenu *subMenu, const wxString &helpStr = "" );
int FindItem( const wxString itemString ) const; int FindItem( const wxString itemString ) const;
void Break(void) {}; void Break(void) {};
void Enable( const int id, const bool enable ); void Enable( int id, bool enable );
bool Enabled( const int id ) const; bool Enabled( int id ) const;
void SetLabel( const int id, const wxString &label ); void SetLabel( int id, const wxString &label );
public: public:

8
include/wx/gtk/notebook.h
View File

@@ -62,17 +62,17 @@ public:
wxNotebook(); wxNotebook();
// the same arguments as for wxControl (@@@ any special styles?) // the same arguments as for wxControl (@@@ any special styles?)
wxNotebook(wxWindow *parent, wxNotebook(wxWindow *parent,
const wxWindowID id, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
const long style = 0, long style = 0,
const wxString& name = "notebook"); const wxString& name = "notebook");
// Create() function // Create() function
bool Create(wxWindow *parent, bool Create(wxWindow *parent,
const wxWindowID id, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
const long style = 0, long style = 0,
const wxString& name = "notebook"); const wxString& name = "notebook");
// dtor // dtor
~wxNotebook(); ~wxNotebook();

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

@@ -38,7 +38,7 @@ class wxPalette: public wxGDIObject
public: public:
wxPalette(void); wxPalette(void);
wxPalette( const int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue ); wxPalette( int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue );
wxPalette( const wxPalette& palette ); wxPalette( const wxPalette& palette );
wxPalette( const wxPalette* palette ); wxPalette( const wxPalette* palette );
~wxPalette(void); ~wxPalette(void);
@@ -47,9 +47,9 @@ class wxPalette: public wxGDIObject
bool operator != ( const wxPalette& palette ); bool operator != ( const wxPalette& palette );
bool Ok(void) const; bool Ok(void) const;
bool Create( const int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue); bool Create( int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
int GetPixel( const unsigned char red, const unsigned char green, const unsigned char blue ) const; int GetPixel( const unsigned char red, const unsigned char green, const unsigned char blue ) const;
bool GetRGB( const int pixel, unsigned char *red, unsigned char *green, unsigned char *blue ) const; bool GetRGB( int pixel, unsigned char *red, unsigned char *green, unsigned char *blue ) const;
// no data // no data
}; };

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

@@ -50,7 +50,7 @@ class wxPen: public wxGDIObject
void SetColour( const wxColour &colour ); void SetColour( const wxColour &colour );
void SetColour( const wxString &colourName ); void SetColour( const wxString &colourName );
void SetColour( const int red, const int green, const int blue ); void SetColour( int red, int green, int blue );
void SetCap( int capStyle ); void SetCap( int capStyle );
void SetJoin( int joinStyle ); void SetJoin( int joinStyle );
void SetStyle( int style ); void SetStyle( int style );

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

@@ -46,34 +46,34 @@ class wxRadioBox: public wxControl
public: public:
wxRadioBox(void); wxRadioBox(void);
wxRadioBox( wxWindow *parent, const wxWindowID id, const wxString& title, wxRadioBox( wxWindow *parent, wxWindowID id, const wxString& title,
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
const int n = 0, const wxString choices[] = NULL, int n = 0, const wxString choices[] = NULL,
const int majorDim = 0, const long style = wxRA_HORIZONTAL, int majorDim = 0, long style = wxRA_HORIZONTAL,
const wxString &name = wxRadioBoxNameStr ); const wxString &name = wxRadioBoxNameStr );
bool Create( wxWindow *parent, const 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,
const int n = 0, const wxString choices[] = NULL, int n = 0, const wxString choices[] = NULL,
const int majorDim = 0, const long style = wxRA_HORIZONTAL, int majorDim = 0, long style = wxRA_HORIZONTAL,
const wxString &name = wxRadioBoxNameStr ); const wxString &name = wxRadioBoxNameStr );
int FindString( const wxString& s) const; int FindString( const wxString& s) const;
void SetSelection( const int n ); void SetSelection( int n );
int GetSelection(void) const; int GetSelection(void) const;
wxString GetString( const int n ) const; wxString GetString( int n ) const;
wxString GetLabel(void) const; wxString GetLabel(void) const;
void SetLabel( const wxString& label ); void SetLabel( const wxString& label );
void SetLabel( const int item, const wxString& label ); void SetLabel( int item, const wxString& label );
void SetLabel( const int item, wxBitmap *bitmap ); void SetLabel( int item, wxBitmap *bitmap );
wxString GetLabel( const int item ) const; wxString GetLabel( int item ) const;
bool Show( const bool show ); bool Show( bool show );
void Enable( const bool enable ); void Enable( bool enable );
void Enable( const int item, const bool enable ); void Enable( int item, bool enable );
void Show( const int item, const bool show ); void Show( int item, bool show );
virtual wxString GetStringSelection(void) const; virtual wxString GetStringSelection(void) const;
virtual bool SetStringSelection( const wxString& s ); virtual bool SetStringSelection( const wxString& s );
virtual int Number(void) const; virtual int Number(void) const;
int GetNumberOfRowsOrCols(void) const; int GetNumberOfRowsOrCols(void) const;
void SetNumberOfRowsOrCols( const int n ); void SetNumberOfRowsOrCols( int n );
private: private:

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

@@ -43,34 +43,34 @@ class wxScrollBar: public wxControl
public: public:
wxScrollBar(void) { m_adjust = NULL; m_oldPos = 0.0; }; wxScrollBar(void) { m_adjust = NULL; m_oldPos = 0.0; };
wxScrollBar(wxWindow *parent, const wxWindowID id, wxScrollBar(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
const long style = wxSB_HORIZONTAL, long style = wxSB_HORIZONTAL,
const wxString& name = wxScrollBarNameStr ); const wxString& name = wxScrollBarNameStr );
~wxScrollBar(void); ~wxScrollBar(void);
bool Create(wxWindow *parent, const wxWindowID id, bool Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
const long style = wxSB_HORIZONTAL, long style = wxSB_HORIZONTAL,
const wxString& name = wxScrollBarNameStr); const wxString& name = wxScrollBarNameStr);
int GetPosition(void) const; int GetPosition(void) const;
int GetThumbSize() const; int GetThumbSize() const;
int GetPageSize() const; int GetPageSize() const;
int GetRange() const; int GetRange() const;
virtual void SetPosition( const int viewStart ); virtual void SetPosition( int viewStart );
virtual void SetScrollbar( const int position, const int thumbSize, const int range, const int pageSize, virtual void SetScrollbar( int position, int thumbSize, int range, int pageSize,
const bool refresh = TRUE ); bool refresh = TRUE );
// Backward compatibility // Backward compatibility
int GetValue(void) const; int GetValue(void) const;
void SetValue( const int viewStart ); void SetValue( int viewStart );
void GetValues( int *viewStart, int *viewLength, int *objectLength, int *pageLength) const; void GetValues( int *viewStart, int *viewLength, int *objectLength, int *pageLength) const;
int GetViewLength() const; int GetViewLength() const;
int GetObjectLength() const; int GetObjectLength() const;
void SetPageSize( const int pageLength ); void SetPageSize( int pageLength );
void SetObjectLength( const int objectLength ); void SetObjectLength( int objectLength );
void SetViewLength( const int viewLength ); void SetViewLength( int viewLength );
public: public:

30
include/wx/gtk/slider.h
View File

@@ -43,43 +43,43 @@ class wxSlider: public wxControl
public: public:
wxSlider(void); wxSlider(void);
wxSlider( wxWindow *parent, const wxWindowID id, wxSlider( wxWindow *parent, wxWindowID id,
const int value, const int minValue, const int maxValue, int value, int minValue, int maxValue,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
const long style = wxSL_HORIZONTAL, long style = wxSL_HORIZONTAL,
/* const wxValidator& validator = wxDefaultValidator, */ /* const wxValidator& validator = wxDefaultValidator, */
const wxString& name = wxSliderNameStr); const wxString& name = wxSliderNameStr);
~wxSlider(void); ~wxSlider(void);
bool Create(wxWindow *parent, const wxWindowID id, bool Create(wxWindow *parent, wxWindowID id,
const int value, const int minValue, const int maxValue, int value, int minValue, int maxValue,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
const long style = wxSL_HORIZONTAL, long style = wxSL_HORIZONTAL,
/* const wxValidator& validator = wxDefaultValidator, */ /* const wxValidator& validator = wxDefaultValidator, */
const wxString& name = wxSliderNameStr); const wxString& name = wxSliderNameStr);
virtual int GetValue(void) const; virtual int GetValue(void) const;
virtual void SetValue( const int ); virtual void SetValue( int );
void GetSize( int *x, int *y ) const; void GetSize( int *x, int *y ) const;
void SetSize( const int x, const int y, const int width, const int height, const int sizeFlags = wxSIZE_AUTO ); void SetSize( int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO );
void GetPosition( int *x, int *y ) const; void GetPosition( int *x, int *y ) const;
void SetRange( const int minValue, const int maxValue ); void SetRange( int minValue, int maxValue );
int GetMin(void) const; int GetMin(void) const;
int GetMax(void) const; int GetMax(void) const;
void SetTickFreq( const int n, const int pos ); void SetTickFreq( int n, int pos );
int GetTickFreq(void) const; int GetTickFreq(void) const;
void SetPageSize( const int pageSize ); void SetPageSize( int pageSize );
int GetPageSize(void) const; int GetPageSize(void) const;
void ClearSel(void); void ClearSel(void);
void ClearTicks(void); void ClearTicks(void);
void SetLineSize( const int lineSize ); void SetLineSize( int lineSize );
int GetLineSize(void) const; int GetLineSize(void) const;
int GetSelEnd(void) const; int GetSelEnd(void) const;
int GetSelStart(void) const; int GetSelStart(void) const;
void SetSelection( const int minPos, const int maxPos ); void SetSelection( int minPos, int maxPos );
void SetThumbLength( const int len ); void SetThumbLength( int len );
int GetThumbLength(void) const; int GetThumbLength(void) const;
void SetTick( const int tickPos ); void SetTick( int tickPos );
public: public:

8
include/wx/gtk/statbmp.h
View File

@@ -43,12 +43,12 @@ class wxStaticBitmap: public wxControl
public: public:
wxStaticBitmap(void); wxStaticBitmap(void);
wxStaticBitmap( wxWindow *parent, const wxWindowID id, const wxBitmap& label, wxStaticBitmap( wxWindow *parent, wxWindowID id, const wxBitmap& label,
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
const long style = 0, const wxString& name = wxStaticBitmapNameStr ); long style = 0, const wxString& name = wxStaticBitmapNameStr );
bool Create( wxWindow *parent, const wxWindowID id, const wxBitmap& label, bool Create( wxWindow *parent, wxWindowID id, const wxBitmap& label,
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
const long style = 0, const wxString& name = wxStaticBitmapNameStr); long style = 0, const wxString& name = wxStaticBitmapNameStr);
virtual void SetBitmap( const wxBitmap& bitmap ); virtual void SetBitmap( const wxBitmap& bitmap );
wxBitmap& GetBitmap(void) const { return (wxBitmap&)m_bitmap; } wxBitmap& GetBitmap(void) const { return (wxBitmap&)m_bitmap; }

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

@@ -46,10 +46,10 @@ class wxStaticBox: public wxControl
wxStaticBox(void); wxStaticBox(void);
wxStaticBox( wxWindow *parent, wxWindowID id, const wxString &label, wxStaticBox( wxWindow *parent, wxWindowID id, const wxString &label,
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
const long style = 0, const wxString &name = wxStaticBoxNameStr ); long style = 0, const wxString &name = wxStaticBoxNameStr );
bool Create( wxWindow *parent, wxWindowID id, const wxString &label, bool Create( wxWindow *parent, wxWindowID id, const wxString &label,
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
const long style = 0, const wxString &name = wxStaticBoxNameStr ); long style = 0, const wxString &name = wxStaticBoxNameStr );
}; };
#endif // __GTKSTATICBOXH__ #endif // __GTKSTATICBOXH__

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

@@ -46,10 +46,10 @@ class wxStaticText: public wxControl
wxStaticText(void); wxStaticText(void);
wxStaticText( wxWindow *parent, wxWindowID id, const wxString &label, wxStaticText( wxWindow *parent, wxWindowID id, const wxString &label,
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
const long style = 0, const wxString &name = wxStaticTextNameStr ); long style = 0, const wxString &name = wxStaticTextNameStr );
bool Create( wxWindow *parent, wxWindowID id, const wxString &label, bool Create( wxWindow *parent, wxWindowID id, const wxString &label,
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
const long style = 0, const wxString &name = wxStaticTextNameStr ); long style = 0, const wxString &name = wxStaticTextNameStr );
wxString GetLabel(void) const; wxString GetLabel(void) const;
void SetLabel( const wxString &label ); void SetLabel( const wxString &label );
}; };

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

@@ -50,9 +50,9 @@ class wxToolBarTool: public wxObject
public: public:
wxToolBarTool(void) {}; wxToolBarTool(void) {};
wxToolBarTool( wxToolBarGTK *owner, const int theIndex = 0, wxToolBarTool( wxToolBarGTK *owner, int theIndex = 0,
const wxBitmap& bitmap1 = wxNullBitmap, const wxBitmap& bitmap2 = wxNullBitmap, const wxBitmap& bitmap1 = wxNullBitmap, const wxBitmap& bitmap2 = wxNullBitmap,
const bool toggle = FALSE, wxObject *clientData = NULL, bool toggle = FALSE, wxObject *clientData = NULL,
const wxString& shortHelpString = "", const wxString& longHelpString = ""); const wxString& shortHelpString = "", const wxString& longHelpString = "");
~wxToolBarTool(void); ~wxToolBarTool(void);
@@ -84,14 +84,14 @@ class wxToolBarGTK: public wxControl
public: public:
wxToolBarGTK(void); wxToolBarGTK(void);
wxToolBarGTK( wxWindow *parent, const wxWindowID id, wxToolBarGTK( wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
const long style = 0, const wxString& name = wxToolBarNameStr ); long style = 0, const wxString& name = wxToolBarNameStr );
~wxToolBarGTK(void); ~wxToolBarGTK(void);
bool Create( wxWindow *parent, const wxWindowID id, bool Create( wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
const long style = 0, const wxString& name = wxToolBarNameStr); long style = 0, const wxString& name = wxToolBarNameStr);
// Only allow toggle if returns TRUE. Call when left button up. // Only allow toggle if returns TRUE. Call when left button up.
virtual bool OnLeftClick(int toolIndex, bool toggleDown); virtual bool OnLeftClick(int toolIndex, bool toggleDown);
@@ -106,25 +106,25 @@ class wxToolBarGTK: public wxControl
// If pushedBitmap is NULL, a reversed version of bitmap is // If pushedBitmap is NULL, a reversed version of bitmap is
// created and used as the pushed/toggled image. // created and used as the pushed/toggled image.
// 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( const int toolIndex, const wxBitmap& bitmap, virtual wxToolBarTool *AddTool( int toolIndex, const wxBitmap& bitmap,
const wxBitmap& pushedBitmap = wxNullBitmap, const bool toggle = FALSE, const wxBitmap& pushedBitmap = wxNullBitmap, bool toggle = FALSE,
const float xPos = -1, const float yPos = -1, wxObject *clientData = NULL, float xPos = -1, float yPos = -1, wxObject *clientData = 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);
virtual void EnableTool(const int toolIndex, const bool enable); virtual void EnableTool(int toolIndex, bool enable);
virtual void ToggleTool(const int toolIndex, const bool toggle); // toggle is TRUE if toggled on virtual void ToggleTool(int toolIndex, bool toggle); // toggle is TRUE if toggled on
virtual void SetToggle(const int toolIndex, const bool toggle); // Set this to be togglable (or not) virtual void SetToggle(int toolIndex, bool toggle); // Set this to be togglable (or not)
virtual wxObject *GetToolClientData(const int index) const; virtual wxObject *GetToolClientData(int index) const;
virtual bool GetToolState(const int toolIndex) const; virtual bool GetToolState(int toolIndex) const;
virtual bool GetToolEnabled(const int toolIndex) const; virtual bool GetToolEnabled(int toolIndex) const;
virtual void SetMargins(const int x, const int y); virtual void SetMargins(int x, int y);
void SetMargins(const wxSize& size) { SetMargins(size.x, size.y); }; void SetMargins(const wxSize& size) { SetMargins(size.x, size.y); };
virtual void SetToolPacking(const int packing); virtual void SetToolPacking(int packing);
virtual void SetToolSeparation(const int separation); virtual void SetToolSeparation(int separation);
public: public:

34
include/wx/gtk/textctrl.h
View File

@@ -50,12 +50,12 @@ class wxTextCtrl: public wxControl, public streambuf
public: public:
wxTextCtrl(void); wxTextCtrl(void);
wxTextCtrl( wxWindow *parent, const wxWindowID id, const wxString &value = "", wxTextCtrl( wxWindow *parent, wxWindowID id, const wxString &value = "",
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
const int style = 0, const wxString &name = wxTextCtrlNameStr ); int style = 0, const wxString &name = wxTextCtrlNameStr );
bool Create( wxWindow *parent, const wxWindowID id, const wxString &value = "", bool Create( wxWindow *parent, wxWindowID id, const wxString &value = "",
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
const int style = 0, const wxString &name = wxTextCtrlNameStr ); int style = 0, const wxString &name = wxTextCtrlNameStr );
wxString GetValue(void) const; wxString GetValue(void) const;
void SetValue( const wxString &value ); void SetValue( const wxString &value );
void WriteText( const wxString &text ); void WriteText( const wxString &text );
@@ -65,21 +65,21 @@ class wxTextCtrl: public wxControl, public streambuf
bool IsModified(void); bool IsModified(void);
void DiscardEdits(void); void DiscardEdits(void);
/* /*
wxString GetLineText( const long lineNo ) const; wxString GetLineText( long lineNo ) const;
void OnDropFiles( wxDropFilesEvent &event ); void OnDropFiles( wxDropFilesEvent &event );
long PositionToXY( const long pos, long *x, long *y ) const; long PositionToXY( long pos, long *x, long *y ) const;
long XYToPosition( const long x, const long y ); long XYToPosition( long x, long y );
int GetNumberOfLines(void); int GetNumberOfLines(void);
*/ */
virtual void SetInsertionPoint( const long pos ); virtual void SetInsertionPoint( long pos );
virtual void SetInsertionPointEnd(void); virtual void SetInsertionPointEnd(void);
virtual void SetEditable( const bool editable ); virtual void SetEditable( bool editable );
virtual void SetSelection( const long from, const long to ); virtual void SetSelection( long from, long to );
void ShowPosition( const long pos ); void ShowPosition( long pos );
virtual long GetInsertionPoint(void) const; virtual long GetInsertionPoint(void) const;
virtual long GetLastPosition(void) const; virtual long GetLastPosition(void) const;
virtual void Remove( const long from, const long to ); virtual void Remove( long from, long to );
virtual void Replace( const long from, const long to, const wxString &value ); virtual void Replace( long from, long to, const wxString &value );
void Cut(void); void Cut(void);
void Copy(void); void Copy(void);
void Paste(void); void Paste(void);
@@ -92,10 +92,10 @@ class wxTextCtrl: public wxControl, public streambuf
int underflow(void); int underflow(void);
wxTextCtrl& operator<<(const wxString& s); wxTextCtrl& operator<<(const wxString& s);
wxTextCtrl& operator<<(const int i); wxTextCtrl& operator<<(int i);
wxTextCtrl& operator<<(const long i); wxTextCtrl& operator<<(long i);
wxTextCtrl& operator<<(const float f); wxTextCtrl& operator<<(float f);
wxTextCtrl& operator<<(const double d); wxTextCtrl& operator<<(double d);
wxTextCtrl& operator<<(const char c); wxTextCtrl& operator<<(const char c);
public: public:

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

@@ -63,35 +63,35 @@ class wxWindow: public wxEvtHandler
public: public:
wxWindow(void); wxWindow(void);
wxWindow( wxWindow *parent, const wxWindowID id, wxWindow( wxWindow *parent, wxWindowID id,
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
const long style = 0, const wxString &name = wxPanelNameStr ); long style = 0, const wxString &name = wxPanelNameStr );
bool Create( wxWindow *parent, const wxWindowID id, bool Create( wxWindow *parent, wxWindowID id,
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
const long style = 0, const wxString &name = wxPanelNameStr ); long style = 0, const wxString &name = wxPanelNameStr );
virtual ~wxWindow(void); virtual ~wxWindow(void);
bool Close( const bool force = FALSE ); bool Close( bool force = FALSE );
virtual bool Destroy(void); virtual bool Destroy(void);
virtual bool DestroyChildren(void); virtual bool DestroyChildren(void);
virtual void PrepareDC( wxDC &dc ); virtual void PrepareDC( wxDC &dc );
virtual void SetSize( const int x, const int y, const int width, const int height, virtual void SetSize( int x, int y, int width, int height,
const int sizeFlags = wxSIZE_AUTO ); int sizeFlags = wxSIZE_AUTO );
virtual void SetSize( const int width, const int height ); virtual void SetSize( int width, int height );
virtual void Move( const int x, const int y ); virtual void Move( int x, int y );
virtual void GetSize( int *width, int *height ) const; virtual void GetSize( int *width, int *height ) const;
virtual void SetClientSize( int const width, int const height ); virtual void SetClientSize( int const width, int const height );
virtual void GetClientSize( int *width, int *height ) const; virtual void GetClientSize( int *width, int *height ) const;
virtual void GetPosition( int *x, int *y ) const; virtual void GetPosition( int *x, int *y ) const;
virtual void Centre( const int direction = wxHORIZONTAL ); virtual void Centre( int direction = wxHORIZONTAL );
virtual void Fit(void); virtual void Fit(void);
void OnSize( wxSizeEvent &event ); void OnSize( wxSizeEvent &event );
virtual bool Show( const bool show ); virtual bool Show( bool show );
virtual void Enable( const bool enable ); virtual void Enable( bool enable );
virtual void MakeModal( const bool modal ); virtual void MakeModal( bool modal );
virtual bool IsEnabled(void) const { return m_isEnabled; }; virtual bool IsEnabled(void) const { return m_isEnabled; };
virtual void SetFocus(void); virtual void SetFocus(void);
virtual bool OnClose(void); virtual bool OnClose(void);
@@ -116,10 +116,10 @@ class wxWindow: public wxEvtHandler
void SetCursor( const wxCursor &cursor ); void SetCursor( const wxCursor &cursor );
virtual void Refresh( const bool eraseBackground = TRUE, const wxRect *rect = NULL ); virtual void Refresh( bool eraseBackground = TRUE, const wxRect *rect = NULL );
virtual void Clear(void); virtual void Clear(void);
virtual bool IsExposed( const long x, const long y ); virtual bool IsExposed( long x, long y );
virtual bool IsExposed( const long x, const long y, const long width, const long height ); virtual bool IsExposed( long x, long y, long width, long height );
virtual wxColour GetBackgroundColour(void) const; virtual wxColour GetBackgroundColour(void) const;
virtual void SetBackgroundColour( const wxColour &colour ); virtual void SetBackgroundColour( const wxColour &colour );
@@ -154,7 +154,7 @@ class wxWindow: public wxEvtHandler
virtual bool IsShown(void); virtual bool IsShown(void);
virtual bool IsRetained(void); virtual bool IsRetained(void);
virtual wxWindow *FindWindow( const long id ); virtual wxWindow *FindWindow( long id );
virtual wxWindow *FindWindow( const wxString& name ); virtual wxWindow *FindWindow( const wxString& name );
void AllowDoubleClick( bool WXUNUSED(allow) ) {}; void AllowDoubleClick( bool WXUNUSED(allow) ) {};
void SetDoubleClick( bool WXUNUSED(allow) ) {}; void SetDoubleClick( bool WXUNUSED(allow) ) {};
@@ -170,18 +170,18 @@ class wxWindow: public wxEvtHandler
virtual void SetDropTarget( wxDropTarget *dropTarget ); virtual void SetDropTarget( wxDropTarget *dropTarget );
virtual wxDropTarget *GetDropTarget() const; virtual wxDropTarget *GetDropTarget() const;
virtual void SetScrollbar( const int orient, const int pos, const int thumbVisible, virtual void SetScrollbar( int orient, int pos, int thumbVisible,
const int range, const bool refresh = TRUE ); int range, bool refresh = TRUE );
virtual void SetScrollPos( const int orient, const int pos, const bool refresh = TRUE ); virtual void SetScrollPos( int orient, int pos, bool refresh = TRUE );
virtual int GetScrollPos( const int orient ) const; virtual int GetScrollPos( int orient ) const;
virtual int GetScrollThumb( const int orient ) const; virtual int GetScrollThumb( int orient ) const;
virtual int GetScrollRange( const int orient ) const; virtual int GetScrollRange( int orient ) const;
virtual void ScrollWindow( const int dx, const int dy, const wxRect* rect = NULL ); virtual void ScrollWindow( int dx, int dy, const wxRect* rect = NULL );
public: // cannot get private going yet public: // cannot get private going yet
void PreCreation( wxWindow *parent, const wxWindowID id, const wxPoint &pos, void PreCreation( wxWindow *parent, wxWindowID id, const wxPoint &pos,
const wxSize &size, const long style, const wxString &name ); const wxSize &size, long style, const wxString &name );
void PostCreation(void); void PostCreation(void);
bool HasVMT(void); bool HasVMT(void);
virtual void ImplementSetSize(void); virtual void ImplementSetSize(void);
@@ -230,7 +230,7 @@ class wxWindow: public wxEvtHandler
wxLayoutConstraints *GetConstraints(void) const; wxLayoutConstraints *GetConstraints(void) const;
void SetConstraints( wxLayoutConstraints *constraints ); void SetConstraints( wxLayoutConstraints *constraints );
void SetAutoLayout( const bool autoLayout ); void SetAutoLayout( bool autoLayout );
bool GetAutoLayout(void) const; bool GetAutoLayout(void) const;
bool Layout(void); bool Layout(void);
void SetSizer( wxSizer *sizer ); void SetSizer( wxSizer *sizer );
@@ -243,15 +243,15 @@ class wxWindow: public wxEvtHandler
void RemoveConstraintReference(wxWindow *otherWin); void RemoveConstraintReference(wxWindow *otherWin);
void DeleteRelatedConstraints(void); void DeleteRelatedConstraints(void);
virtual void ResetConstraints(void); virtual void ResetConstraints(void);
virtual void SetConstraintSizes(const bool recurse = TRUE); virtual void SetConstraintSizes(bool recurse = TRUE);
virtual bool LayoutPhase1(int *noChanges); virtual bool LayoutPhase1(int *noChanges);
virtual bool LayoutPhase2(int *noChanges); virtual bool LayoutPhase2(int *noChanges);
virtual bool DoPhase(const int); virtual bool DoPhase(int);
virtual void TransformSizerToActual(int *x, int *y) const ; virtual void TransformSizerToActual(int *x, int *y) const ;
virtual void SizerSetSize(const int x, const int y, const int w, const int h); virtual void SizerSetSize(int x, int y, int w, int h);
virtual void SizerMove(const int x, const int y); virtual void SizerMove(int x, int y);
virtual void SetSizeConstraint(const int x, const int y, const int w, const int h); virtual void SetSizeConstraint(int x, int y, int w, int h);
virtual void MoveConstraint(const int x, const int y); virtual void MoveConstraint(int x, int y);
virtual void GetSizeConstraint(int *w, int *h) const ; virtual void GetSizeConstraint(int *w, int *h) const ;
virtual void GetClientSizeConstraint(int *w, int *h) const ; virtual void GetClientSizeConstraint(int *w, int *h) const ;
virtual void GetPositionConstraint(int *x, int *y) const ; virtual void GetPositionConstraint(int *x, int *y) const ;

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

@@ -47,7 +47,7 @@ class wxMask: public wxObject
wxMask(void); wxMask(void);
wxMask( const wxBitmap& bitmap, const wxColour& colour ); wxMask( const wxBitmap& bitmap, const wxColour& colour );
wxMask( const wxBitmap& bitmap, const int paletteIndex ); wxMask( const wxBitmap& bitmap, int paletteIndex );
wxMask( const wxBitmap& bitmap ); wxMask( const wxBitmap& bitmap );
~wxMask(void); ~wxMask(void);
@@ -80,12 +80,12 @@ class wxBitmap: public wxObject
public: public:
wxBitmap(void); wxBitmap(void);
wxBitmap( const int width, const int height, const int depth = -1 ); wxBitmap( int width, int height, int depth = -1 );
wxBitmap( const char bits[], const int width, const int height, const int depth = 1 ); wxBitmap( const char bits[], int width, int height, int depth = 1 );
wxBitmap( char **bits ); wxBitmap( char **bits );
wxBitmap( const wxBitmap& bmp ); wxBitmap( const wxBitmap& bmp );
wxBitmap( const wxBitmap* bmp ); wxBitmap( const wxBitmap* bmp );
wxBitmap( const wxString &filename, const int type ); wxBitmap( const wxString &filename, int type );
~wxBitmap(void); ~wxBitmap(void);
wxBitmap& operator = ( const wxBitmap& bmp ); wxBitmap& operator = ( const wxBitmap& bmp );
bool operator == ( const wxBitmap& bmp ); bool operator == ( const wxBitmap& bmp );
@@ -95,15 +95,15 @@ class wxBitmap: public wxObject
int GetHeight(void) const; int GetHeight(void) const;
int GetWidth(void) const; int GetWidth(void) const;
int GetDepth(void) const; int GetDepth(void) const;
void SetHeight( const int height ); void SetHeight( int height );
void SetWidth( const int width ); void SetWidth( int width );
void SetDepth( const int depth ); void SetDepth( int depth );
wxMask *GetMask(void) const; wxMask *GetMask(void) const;
void SetMask( wxMask *mask ); void SetMask( wxMask *mask );
bool SaveFile( const wxString &name, const int type, wxPalette *palette = NULL ); bool SaveFile( const wxString &name, int type, wxPalette *palette = NULL );
bool LoadFile( const wxString &name, const int type ); bool LoadFile( const wxString &name, int type );
wxPalette *GetPalette(void) const; wxPalette *GetPalette(void) const;
wxPalette *GetColourMap(void) const wxPalette *GetColourMap(void) const

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

@@ -46,10 +46,10 @@ class wxBitmapButton: public wxControl
wxBitmapButton(void); wxBitmapButton(void);
wxBitmapButton( wxWindow *parent, wxWindowID id, const wxBitmap &bitmap, wxBitmapButton( wxWindow *parent, wxWindowID id, const wxBitmap &bitmap,
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
const long style = 0, const wxString &name = wxButtonNameStr ); long style = 0, const wxString &name = wxButtonNameStr );
bool Create( wxWindow *parent, wxWindowID id, const wxBitmap &bitmap, bool Create( wxWindow *parent, wxWindowID id, const wxBitmap &bitmap,
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
const long style = 0, const wxString &name = wxButtonNameStr ); long style = 0, const wxString &name = wxButtonNameStr );
void SetDefault(void); void SetDefault(void);
void SetLabel( const wxString &label ); void SetLabel( const wxString &label );
wxString GetLabel(void) const; wxString GetLabel(void) const;

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

@@ -39,8 +39,8 @@ class wxBrush: public wxGDIObject
public: public:
wxBrush(void); wxBrush(void);
wxBrush( const wxColour &colour, const int style ); wxBrush( const wxColour &colour, int style );
wxBrush( const wxString &colourName, const int style ); wxBrush( const wxString &colourName, int style );
wxBrush( const wxBitmap &stippleBitmap ); wxBrush( const wxBitmap &stippleBitmap );
wxBrush( const wxBrush &brush ); wxBrush( const wxBrush &brush );
wxBrush( const wxBrush *brush ); wxBrush( const wxBrush *brush );

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

@@ -46,10 +46,10 @@ class wxButton: public wxControl
wxButton(void); wxButton(void);
wxButton( wxWindow *parent, wxWindowID id, const wxString &label, wxButton( wxWindow *parent, wxWindowID id, const wxString &label,
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
const long style = 0, const wxString &name = wxButtonNameStr ); long style = 0, const wxString &name = wxButtonNameStr );
bool Create( wxWindow *parent, wxWindowID id, const wxString &label, bool Create( wxWindow *parent, wxWindowID id, const wxString &label,
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
const long style = 0, const wxString &name = wxButtonNameStr ); long style = 0, const wxString &name = wxButtonNameStr );
void SetDefault(void); void SetDefault(void);
void SetLabel( const wxString &label ); void SetLabel( const wxString &label );
wxString GetLabel(void) const; wxString GetLabel(void) const;

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

@@ -46,11 +46,11 @@ class wxCheckBox: public wxControl
wxCheckBox(void); wxCheckBox(void);
wxCheckBox( wxWindow *parent, wxWindowID id, const wxString &label, wxCheckBox( wxWindow *parent, wxWindowID id, const wxString &label,
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
const long style = 0, const wxString &name = wxCheckBoxNameStr ); long style = 0, const wxString &name = wxCheckBoxNameStr );
bool Create( wxWindow *parent, wxWindowID id, const wxString &label, bool Create( wxWindow *parent, wxWindowID id, const wxString &label,
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
const long style = 0, const wxString &name = wxCheckBoxNameStr ); long style = 0, const wxString &name = wxCheckBoxNameStr );
void SetValue( const bool state ); void SetValue( bool state );
bool GetValue(void) const; bool GetValue(void) const;
}; };

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

@@ -44,24 +44,24 @@ class wxChoice: public wxControl
public: public:
wxChoice(void); wxChoice(void);
wxChoice( wxWindow *parent, const wxWindowID id, wxChoice( wxWindow *parent, wxWindowID id,
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
const int n = 0, const wxString choices[] = NULL, int n = 0, const wxString choices[] = NULL,
const long style = 0, const wxString &name = wxChoiceNameStr ); long style = 0, const wxString &name = wxChoiceNameStr );
bool Create( wxWindow *parent, const wxWindowID id, bool Create( wxWindow *parent, wxWindowID id,
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
const int n = 0, const wxString choices[] = NULL, int n = 0, const wxString choices[] = NULL,
const long style = 0, const wxString &name = wxChoiceNameStr ); long style = 0, const wxString &name = wxChoiceNameStr );
void Append( const wxString &item ); void Append( const wxString &item );
void Clear(void); void Clear(void);
int FindString( const wxString &string ) const; int FindString( const wxString &string ) const;
int GetColumns(void) const; int GetColumns(void) const;
int GetSelection(void); int GetSelection(void);
wxString GetString( const int n ) const; wxString GetString( int n ) const;
wxString GetStringSelection(void) const; wxString GetStringSelection(void) const;
int Number(void) const; int Number(void) const;
void SetColumns( const int n = 1 ); void SetColumns( int n = 1 );
void SetSelection( const int n ); void SetSelection( int n );
void SetStringSelection( const wxString &string ); void SetStringSelection( const wxString &string );
}; };

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

@@ -44,38 +44,38 @@ class wxComboBox: public wxControl
public: public:
inline wxComboBox(void) {} inline wxComboBox(void) {}
inline wxComboBox(wxWindow *parent, const wxWindowID id, inline wxComboBox(wxWindow *parent, wxWindowID id,
const wxString& value = wxEmptyString, const wxString& value = wxEmptyString,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
const int n = 0, const wxString choices[] = NULL, int n = 0, const wxString choices[] = NULL,
const long style = 0, long style = 0,
const wxString& name = wxComboBoxNameStr) const wxString& name = wxComboBoxNameStr)
{ {
Create(parent, id, value, pos, size, n, choices, style, name); Create(parent, id, value, pos, size, n, choices, style, name);
} }
bool Create(wxWindow *parent, const wxWindowID id, bool Create(wxWindow *parent, wxWindowID id,
const wxString& value = wxEmptyString, const wxString& value = wxEmptyString,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
const int n = 0, const wxString choices[] = NULL, int n = 0, const wxString choices[] = NULL,
const long style = 0, long style = 0,
const wxString& name = wxComboBoxNameStr); const wxString& name = wxComboBoxNameStr);
// List functions // List functions
void Clear(void); void Clear(void);
void Append( const wxString &item ); void Append( const wxString &item );
void Append( const wxString &item, char* clientData ); void Append( const wxString &item, char* clientData );
void Delete( const int n ); void Delete( int n );
int FindString( const wxString &item ); int FindString( const wxString &item );
char* GetClientData( const int n ); char* GetClientData( int n );
void SetClientData( const int n, char * clientData ); void SetClientData( int n, char * clientData );
int GetSelection(void) const; int GetSelection(void) const;
wxString GetString( const int n ) const; wxString GetString( int n ) const;
wxString GetStringSelection(void) const; wxString GetStringSelection(void) const;
int Number(void) const; int Number(void) const;
void SetSelection( const int n ); void SetSelection( int n );
// Text field functions // Text field functions
wxString GetValue(void) const ; wxString GetValue(void) const ;
@@ -85,14 +85,14 @@ class wxComboBox: public wxControl
void Copy(void); void Copy(void);
void Cut(void); void Cut(void);
void Paste(void); void Paste(void);
void SetInsertionPoint(const long pos); void SetInsertionPoint(long pos);
void SetInsertionPointEnd(void); void SetInsertionPointEnd(void);
long GetInsertionPoint(void) const ; long GetInsertionPoint(void) const ;
long GetLastPosition(void) const ; long GetLastPosition(void) const ;
void Replace(const long from, const long to, const wxString& value); void Replace(long from, long to, const wxString& value);
void Remove(const long from, const long to); void Remove(long from, long to);
void SetSelection(const long from, const long to); void SetSelection(long from, long to);
void SetEditable(const bool editable); void SetEditable(bool editable);
private: private:

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

@@ -40,7 +40,7 @@ class wxControl: public wxWindow
wxControl(void); wxControl(void);
wxControl( wxWindow *parent, wxWindowID id, wxControl( wxWindow *parent, wxWindowID id,
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
const long style = 0, const wxString &name = wxPanelNameStr ); long style = 0, const wxString &name = wxPanelNameStr );
virtual void Command( wxCommandEvent &event ); virtual void Command( wxCommandEvent &event );
virtual void SetLabel( const wxString &label ); virtual void SetLabel( const wxString &label );
virtual wxString GetLabel(void) const; virtual wxString GetLabel(void) const;

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

@@ -39,7 +39,7 @@ class wxCursor: public wxObject
public: public:
wxCursor(void); wxCursor(void);
wxCursor( const int cursorId ); wxCursor( int cursorId );
wxCursor( const wxCursor &cursor ); wxCursor( const wxCursor &cursor );
wxCursor( const wxCursor *cursor ); wxCursor( const wxCursor *cursor );
~wxCursor(void); ~wxCursor(void);

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

@@ -53,10 +53,10 @@ class wxDialog: public wxWindow
wxDialog(void); wxDialog(void);
wxDialog( wxWindow *parent, wxWindowID id, const wxString &title, wxDialog( wxWindow *parent, wxWindowID id, const wxString &title,
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
const long style = wxDEFAULT_DIALOG_STYLE, const wxString &name = wxDialogNameStr ); long style = wxDEFAULT_DIALOG_STYLE, const wxString &name = wxDialogNameStr );
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,
const long style = wxDEFAULT_DIALOG_STYLE, const wxString &name = wxDialogNameStr ); long style = wxDEFAULT_DIALOG_STYLE, const wxString &name = wxDialogNameStr );
~wxDialog(void); ~wxDialog(void);
void SetTitle(const wxString& title); void SetTitle(const wxString& title);
wxString GetTitle(void) const; wxString GetTitle(void) const;
@@ -69,7 +69,7 @@ class wxDialog: public wxWindow
/* /*
void OnCharHook(wxKeyEvent& event); void OnCharHook(wxKeyEvent& event);
*/ */
virtual bool Show( const bool show ); virtual bool Show( bool show );
virtual int ShowModal(void); virtual int ShowModal(void);
virtual void EndModal(int retCode); virtual void EndModal(int retCode);
virtual bool IsModal(void) const { return ((GetWindowStyleFlag() & wxDIALOG_MODAL) == wxDIALOG_MODAL); } virtual bool IsModal(void) const { return ((GetWindowStyleFlag() & wxDIALOG_MODAL) == wxDIALOG_MODAL); }

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

@@ -76,7 +76,7 @@ class wxDragSource: public wxObject
wxDragSource( wxWindow *win ); wxDragSource( wxWindow *win );
~wxDragSource(void); ~wxDragSource(void);
void SetData( char *data, const long size ); void SetData( char *data, long size );
void Start( int x, int y ); void Start( int x, int y );
public: public:

18
include/wx/gtk1/frame.h
View File

@@ -47,23 +47,23 @@ class wxFrame: public wxWindow
public: public:
wxFrame(void); wxFrame(void);
wxFrame( wxWindow *parent, const wxWindowID id, const wxString &title, wxFrame( wxWindow *parent, wxWindowID id, const wxString &title,
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
const long style = wxDEFAULT_FRAME_STYLE, const wxString &name = wxFrameNameStr ); long style = wxDEFAULT_FRAME_STYLE, const wxString &name = wxFrameNameStr );
bool Create( wxWindow *parent, const 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,
const long style = wxDEFAULT_FRAME_STYLE, const wxString &name = wxFrameNameStr ); long style = wxDEFAULT_FRAME_STYLE, const wxString &name = wxFrameNameStr );
~wxFrame(void); ~wxFrame(void);
bool Destroy(void); bool Destroy(void);
void OnCloseWindow( wxCloseEvent& event ); void OnCloseWindow( wxCloseEvent& event );
virtual bool Show( const bool show ); virtual bool Show( bool show );
virtual void Enable( const bool enable ); virtual void Enable( bool enable );
virtual void GetClientSize( int *width, int *height ) const; virtual void GetClientSize( int *width, int *height ) const;
void OnSize( wxSizeEvent &event ); void OnSize( wxSizeEvent &event );
void SetMenuBar( wxMenuBar *menuBar ); void SetMenuBar( wxMenuBar *menuBar );
virtual bool CreateStatusBar( const int number = 1 ); virtual bool CreateStatusBar( int number = 1 );
virtual void SetStatusText( const wxString &text, const int number = 0 ); virtual void SetStatusText( const wxString &text, int number = 0 );
virtual void SetStatusWidths( const int n, const int *width ); virtual void SetStatusWidths( int n, int *width );
wxStatusBar *GetStatusBar(void); wxStatusBar *GetStatusBar(void);
wxMenuBar *GetMenuBar(void); wxMenuBar *GetMenuBar(void);
void SetTitle( const wxString &title ); void SetTitle( const wxString &title );

20
include/wx/gtk1/gauge.h
View File

@@ -44,27 +44,27 @@ class wxGauge: public wxControl
public: public:
inline wxGauge(void) { m_rangeMax = 0; m_gaugePos = 0; m_useProgressBar = TRUE; } inline wxGauge(void) { m_rangeMax = 0; m_gaugePos = 0; m_useProgressBar = TRUE; }
inline wxGauge(wxWindow *parent, const wxWindowID id, inline wxGauge(wxWindow *parent, wxWindowID id,
const int range, int range,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
const long style = wxGA_HORIZONTAL, long style = wxGA_HORIZONTAL,
const wxString& name = wxGaugeNameStr) const wxString& name = wxGaugeNameStr)
{ {
Create(parent, id, range, pos, size, style, name); Create(parent, id, range, pos, size, style, name);
}; };
bool Create(wxWindow *parent, const wxWindowID id, bool Create(wxWindow *parent, wxWindowID id,
const int range, int range,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
const long style = wxGA_HORIZONTAL, long style = wxGA_HORIZONTAL,
const wxString& name = wxGaugeNameStr ); const wxString& name = wxGaugeNameStr );
void SetShadowWidth( const int WXUNUSED(w) ) {}; void SetShadowWidth( int WXUNUSED(w) ) {};
void SetBezelFace( const int WXUNUSED(w) ) {}; void SetBezelFace( int WXUNUSED(w) ) {};
void SetRange( const int r ); void SetRange( int r );
void SetValue( const int pos ); void SetValue( int pos );
int GetShadowWidth(void) const { return 0; }; int GetShadowWidth(void) const { return 0; };
int GetBezelFace(void) const { return 0; }; int GetBezelFace(void) const { return 0; };
int GetRange(void) const; int GetRange(void) const;

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

@@ -41,7 +41,7 @@ public:
inline wxIcon(const wxIcon& icon) { Ref(icon); } inline wxIcon(const wxIcon& icon) { Ref(icon); }
inline wxIcon(const wxIcon* icon) { if (icon) Ref(*icon); } inline wxIcon(const wxIcon* icon) { if (icon) Ref(*icon); }
wxIcon( char **bits, const int width = -1, const int height = -1 ) : wxIcon( char **bits, int width = -1, int height = -1 ) :
wxBitmap( bits ) {}; wxBitmap( bits ) {};
inline wxIcon& operator = (const wxIcon& icon) { if (*this == icon) return (*this); Ref(icon); return *this; } inline wxIcon& operator = (const wxIcon& icon) { if (*this == icon) return (*this); Ref(icon); return *this; }

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

@@ -46,32 +46,32 @@ class wxListBox: public wxControl
wxListBox(void); wxListBox(void);
wxListBox( wxWindow *parent, wxWindowID id, wxListBox( wxWindow *parent, wxWindowID id,
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
const int n = 0, const wxString choices[] = NULL, int n = 0, const wxString choices[] = NULL,
const long style = 0, const wxString &name = wxListBoxNameStr ); long style = 0, const wxString &name = wxListBoxNameStr );
bool Create( wxWindow *parent, wxWindowID id, bool Create( wxWindow *parent, wxWindowID id,
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
const int n = 0, const wxString choices[] = NULL, int n = 0, const wxString choices[] = NULL,
const long style = 0, const wxString &name = wxListBoxNameStr ); long style = 0, const wxString &name = wxListBoxNameStr );
void Append( const wxString &item ); void Append( const wxString &item );
void Append( const wxString &item, char *clientData ); void Append( const wxString &item, char *clientData );
void Clear(void); void Clear(void);
void Delete( int n ); void Delete( int n );
void Deselect( int n ); void Deselect( int n );
int FindString( const wxString &item ) const; int FindString( const wxString &item ) const;
char *GetClientData( const int n ) const; char *GetClientData( int n ) const;
int GetSelection(void) const; int GetSelection(void) const;
int GetSelections( class wxArrayInt &) const; int GetSelections( class wxArrayInt &) const;
wxString GetString( int n ) const; wxString GetString( int n ) const;
wxString GetStringSelection(void) const; wxString GetStringSelection(void) const;
int Number(void); int Number(void);
bool Selected( const int n ); bool Selected( int n );
void Set( const int n, const wxString *choices ); void Set( int n, const wxString *choices );
void SetClientData( const int n, char *clientData ); void SetClientData( int n, char *clientData );
void SetFirstItem( int n ); void SetFirstItem( int n );
void SetFirstItem( const wxString &item ); void SetFirstItem( const wxString &item );
void SetSelection( const int n, const bool select = TRUE ); void SetSelection( int n, bool select = TRUE );
void SetString( const int n, const wxString &string ); void SetString( int n, const wxString &string );
void SetStringSelection( const wxString &string, const bool select = TRUE ); void SetStringSelection( const wxString &string, bool select = TRUE );
private: private:

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

@@ -52,15 +52,15 @@ class wxMDIParentFrame: public wxFrame
wxMDIParentFrame(void); wxMDIParentFrame(void);
wxMDIParentFrame( wxWindow *parent, wxMDIParentFrame( wxWindow *parent,
const wxWindowID id, const wxString& title, wxWindowID id, const wxString& title,
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
const long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL, long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
const wxString& name = wxFrameNameStr ); const wxString& name = wxFrameNameStr );
~wxMDIParentFrame(void); ~wxMDIParentFrame(void);
bool Create( wxWindow *parent, bool Create( wxWindow *parent,
const wxWindowID id, const wxString& title, wxWindowID id, const wxString& title,
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
const long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL, long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
const wxString& name = wxFrameNameStr ); const wxString& name = wxFrameNameStr );
void OnSize( wxSizeEvent& event ); void OnSize( wxSizeEvent& event );
@@ -101,20 +101,20 @@ class wxMDIChildFrame: public wxPanel
wxMDIChildFrame(void); wxMDIChildFrame(void);
wxMDIChildFrame( wxMDIParentFrame *parent, wxMDIChildFrame( wxMDIParentFrame *parent,
const wxWindowID id, const wxString& title, wxWindowID id, const wxString& title,
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
const long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxFrameNameStr ); long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxFrameNameStr );
~wxMDIChildFrame(void); ~wxMDIChildFrame(void);
bool Create( wxMDIParentFrame *parent, bool Create( wxMDIParentFrame *parent,
const wxWindowID id, const wxString& title, wxWindowID id, const wxString& title,
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
const long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxFrameNameStr ); long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxFrameNameStr );
void SetMenuBar( wxMenuBar *menu_bar ); void SetMenuBar( wxMenuBar *menu_bar );
// no status bars in wxGTK // no status bars in wxGTK
virtual bool CreateStatusBar( const int WXUNUSED(number) = 1 ) { return FALSE; }; virtual bool CreateStatusBar( int WXUNUSED(number) = 1 ) { return FALSE; };
virtual void SetStatusText( const wxString &WXUNUSED(text), const int WXUNUSED(number) ) {}; virtual void SetStatusText( const wxString &WXUNUSED(text), int WXUNUSED(number) ) {};
virtual void SetStatusWidths( const int WXUNUSED(n), const int *WXUNUSED(width) ) {}; virtual void SetStatusWidths( int WXUNUSED(n), int *WXUNUSED(width) ) {};
virtual void Maximize(void) {}; virtual void Maximize(void) {};
virtual void Restore(void) {}; virtual void Restore(void) {};
@@ -136,9 +136,9 @@ class wxMDIClientWindow: public wxWindow
public: public:
wxMDIClientWindow(void); wxMDIClientWindow(void);
wxMDIClientWindow( wxMDIParentFrame *parent, const long style = 0 ); wxMDIClientWindow( wxMDIParentFrame *parent, long style = 0 );
~wxMDIClientWindow(void); ~wxMDIClientWindow(void);
virtual bool CreateClient( wxMDIParentFrame *parent, const long style = wxVSCROLL | wxHSCROLL ); virtual bool CreateClient( wxMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL );
void AddChild( wxWindow *child ); void AddChild( wxWindow *child );
}; };

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

@@ -80,15 +80,15 @@ class wxMenu: public wxEvtHandler
wxMenu( const wxString &title = "" ); wxMenu( const wxString &title = "" );
void AppendSeparator(void); void AppendSeparator(void);
void Append( const int id, const wxString &item, void Append( int id, const wxString &item,
const wxString &helpStr = "", const bool checkable = FALSE ); const wxString &helpStr = "", bool checkable = FALSE );
void Append( const int id, const wxString &item, void Append( int id, const wxString &item,
wxMenu *subMenu, const wxString &helpStr = "" ); wxMenu *subMenu, const wxString &helpStr = "" );
int FindItem( const wxString itemString ) const; int FindItem( const wxString itemString ) const;
void Break(void) {}; void Break(void) {};
void Enable( const int id, const bool enable ); void Enable( int id, bool enable );
bool Enabled( const int id ) const; bool Enabled( int id ) const;
void SetLabel( const int id, const wxString &label ); void SetLabel( int id, const wxString &label );
public: public:

8
include/wx/gtk1/notebook.h
View File

@@ -62,17 +62,17 @@ public:
wxNotebook(); wxNotebook();
// the same arguments as for wxControl (@@@ any special styles?) // the same arguments as for wxControl (@@@ any special styles?)
wxNotebook(wxWindow *parent, wxNotebook(wxWindow *parent,
const wxWindowID id, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
const long style = 0, long style = 0,
const wxString& name = "notebook"); const wxString& name = "notebook");
// Create() function // Create() function
bool Create(wxWindow *parent, bool Create(wxWindow *parent,
const wxWindowID id, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
const long style = 0, long style = 0,
const wxString& name = "notebook"); const wxString& name = "notebook");
// dtor // dtor
~wxNotebook(); ~wxNotebook();

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

@@ -38,7 +38,7 @@ class wxPalette: public wxGDIObject
public: public:
wxPalette(void); wxPalette(void);
wxPalette( const int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue ); wxPalette( int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue );
wxPalette( const wxPalette& palette ); wxPalette( const wxPalette& palette );
wxPalette( const wxPalette* palette ); wxPalette( const wxPalette* palette );
~wxPalette(void); ~wxPalette(void);
@@ -47,9 +47,9 @@ class wxPalette: public wxGDIObject
bool operator != ( const wxPalette& palette ); bool operator != ( const wxPalette& palette );
bool Ok(void) const; bool Ok(void) const;
bool Create( const int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue); bool Create( int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
int GetPixel( const unsigned char red, const unsigned char green, const unsigned char blue ) const; int GetPixel( const unsigned char red, const unsigned char green, const unsigned char blue ) const;
bool GetRGB( const int pixel, unsigned char *red, unsigned char *green, unsigned char *blue ) const; bool GetRGB( int pixel, unsigned char *red, unsigned char *green, unsigned char *blue ) const;
// no data // no data
}; };

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

@@ -50,7 +50,7 @@ class wxPen: public wxGDIObject
void SetColour( const wxColour &colour ); void SetColour( const wxColour &colour );
void SetColour( const wxString &colourName ); void SetColour( const wxString &colourName );
void SetColour( const int red, const int green, const int blue ); void SetColour( int red, int green, int blue );
void SetCap( int capStyle ); void SetCap( int capStyle );
void SetJoin( int joinStyle ); void SetJoin( int joinStyle );
void SetStyle( int style ); void SetStyle( int style );

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

@@ -46,34 +46,34 @@ class wxRadioBox: public wxControl
public: public:
wxRadioBox(void); wxRadioBox(void);
wxRadioBox( wxWindow *parent, const wxWindowID id, const wxString& title, wxRadioBox( wxWindow *parent, wxWindowID id, const wxString& title,
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
const int n = 0, const wxString choices[] = NULL, int n = 0, const wxString choices[] = NULL,
const int majorDim = 0, const long style = wxRA_HORIZONTAL, int majorDim = 0, long style = wxRA_HORIZONTAL,
const wxString &name = wxRadioBoxNameStr ); const wxString &name = wxRadioBoxNameStr );
bool Create( wxWindow *parent, const 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,
const int n = 0, const wxString choices[] = NULL, int n = 0, const wxString choices[] = NULL,
const int majorDim = 0, const long style = wxRA_HORIZONTAL, int majorDim = 0, long style = wxRA_HORIZONTAL,
const wxString &name = wxRadioBoxNameStr ); const wxString &name = wxRadioBoxNameStr );
int FindString( const wxString& s) const; int FindString( const wxString& s) const;
void SetSelection( const int n ); void SetSelection( int n );
int GetSelection(void) const; int GetSelection(void) const;
wxString GetString( const int n ) const; wxString GetString( int n ) const;
wxString GetLabel(void) const; wxString GetLabel(void) const;
void SetLabel( const wxString& label ); void SetLabel( const wxString& label );
void SetLabel( const int item, const wxString& label ); void SetLabel( int item, const wxString& label );
void SetLabel( const int item, wxBitmap *bitmap ); void SetLabel( int item, wxBitmap *bitmap );
wxString GetLabel( const int item ) const; wxString GetLabel( int item ) const;
bool Show( const bool show ); bool Show( bool show );
void Enable( const bool enable ); void Enable( bool enable );
void Enable( const int item, const bool enable ); void Enable( int item, bool enable );
void Show( const int item, const bool show ); void Show( int item, bool show );
virtual wxString GetStringSelection(void) const; virtual wxString GetStringSelection(void) const;
virtual bool SetStringSelection( const wxString& s ); virtual bool SetStringSelection( const wxString& s );
virtual int Number(void) const; virtual int Number(void) const;
int GetNumberOfRowsOrCols(void) const; int GetNumberOfRowsOrCols(void) const;
void SetNumberOfRowsOrCols( const int n ); void SetNumberOfRowsOrCols( int n );
private: private:

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

@@ -43,34 +43,34 @@ class wxScrollBar: public wxControl
public: public:
wxScrollBar(void) { m_adjust = NULL; m_oldPos = 0.0; }; wxScrollBar(void) { m_adjust = NULL; m_oldPos = 0.0; };
wxScrollBar(wxWindow *parent, const wxWindowID id, wxScrollBar(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
const long style = wxSB_HORIZONTAL, long style = wxSB_HORIZONTAL,
const wxString& name = wxScrollBarNameStr ); const wxString& name = wxScrollBarNameStr );
~wxScrollBar(void); ~wxScrollBar(void);
bool Create(wxWindow *parent, const wxWindowID id, bool Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
const long style = wxSB_HORIZONTAL, long style = wxSB_HORIZONTAL,
const wxString& name = wxScrollBarNameStr); const wxString& name = wxScrollBarNameStr);
int GetPosition(void) const; int GetPosition(void) const;
int GetThumbSize() const; int GetThumbSize() const;
int GetPageSize() const; int GetPageSize() const;
int GetRange() const; int GetRange() const;
virtual void SetPosition( const int viewStart ); virtual void SetPosition( int viewStart );
virtual void SetScrollbar( const int position, const int thumbSize, const int range, const int pageSize, virtual void SetScrollbar( int position, int thumbSize, int range, int pageSize,
const bool refresh = TRUE ); bool refresh = TRUE );
// Backward compatibility // Backward compatibility
int GetValue(void) const; int GetValue(void) const;
void SetValue( const int viewStart ); void SetValue( int viewStart );
void GetValues( int *viewStart, int *viewLength, int *objectLength, int *pageLength) const; void GetValues( int *viewStart, int *viewLength, int *objectLength, int *pageLength) const;
int GetViewLength() const; int GetViewLength() const;
int GetObjectLength() const; int GetObjectLength() const;
void SetPageSize( const int pageLength ); void SetPageSize( int pageLength );
void SetObjectLength( const int objectLength ); void SetObjectLength( int objectLength );
void SetViewLength( const int viewLength ); void SetViewLength( int viewLength );
public: public:

30
include/wx/gtk1/slider.h
View File

@@ -43,43 +43,43 @@ class wxSlider: public wxControl
public: public:
wxSlider(void); wxSlider(void);
wxSlider( wxWindow *parent, const wxWindowID id, wxSlider( wxWindow *parent, wxWindowID id,
const int value, const int minValue, const int maxValue, int value, int minValue, int maxValue,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
const long style = wxSL_HORIZONTAL, long style = wxSL_HORIZONTAL,
/* const wxValidator& validator = wxDefaultValidator, */ /* const wxValidator& validator = wxDefaultValidator, */
const wxString& name = wxSliderNameStr); const wxString& name = wxSliderNameStr);
~wxSlider(void); ~wxSlider(void);
bool Create(wxWindow *parent, const wxWindowID id, bool Create(wxWindow *parent, wxWindowID id,
const int value, const int minValue, const int maxValue, int value, int minValue, int maxValue,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
const long style = wxSL_HORIZONTAL, long style = wxSL_HORIZONTAL,
/* const wxValidator& validator = wxDefaultValidator, */ /* const wxValidator& validator = wxDefaultValidator, */
const wxString& name = wxSliderNameStr); const wxString& name = wxSliderNameStr);
virtual int GetValue(void) const; virtual int GetValue(void) const;
virtual void SetValue( const int ); virtual void SetValue( int );
void GetSize( int *x, int *y ) const; void GetSize( int *x, int *y ) const;
void SetSize( const int x, const int y, const int width, const int height, const int sizeFlags = wxSIZE_AUTO ); void SetSize( int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO );
void GetPosition( int *x, int *y ) const; void GetPosition( int *x, int *y ) const;
void SetRange( const int minValue, const int maxValue ); void SetRange( int minValue, int maxValue );
int GetMin(void) const; int GetMin(void) const;
int GetMax(void) const; int GetMax(void) const;
void SetTickFreq( const int n, const int pos ); void SetTickFreq( int n, int pos );
int GetTickFreq(void) const; int GetTickFreq(void) const;
void SetPageSize( const int pageSize ); void SetPageSize( int pageSize );
int GetPageSize(void) const; int GetPageSize(void) const;
void ClearSel(void); void ClearSel(void);
void ClearTicks(void); void ClearTicks(void);
void SetLineSize( const int lineSize ); void SetLineSize( int lineSize );
int GetLineSize(void) const; int GetLineSize(void) const;
int GetSelEnd(void) const; int GetSelEnd(void) const;
int GetSelStart(void) const; int GetSelStart(void) const;
void SetSelection( const int minPos, const int maxPos ); void SetSelection( int minPos, int maxPos );
void SetThumbLength( const int len ); void SetThumbLength( int len );
int GetThumbLength(void) const; int GetThumbLength(void) const;
void SetTick( const int tickPos ); void SetTick( int tickPos );
public: public:

8
include/wx/gtk1/statbmp.h
View File

@@ -43,12 +43,12 @@ class wxStaticBitmap: public wxControl
public: public:
wxStaticBitmap(void); wxStaticBitmap(void);
wxStaticBitmap( wxWindow *parent, const wxWindowID id, const wxBitmap& label, wxStaticBitmap( wxWindow *parent, wxWindowID id, const wxBitmap& label,
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
const long style = 0, const wxString& name = wxStaticBitmapNameStr ); long style = 0, const wxString& name = wxStaticBitmapNameStr );
bool Create( wxWindow *parent, const wxWindowID id, const wxBitmap& label, bool Create( wxWindow *parent, wxWindowID id, const wxBitmap& label,
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
const long style = 0, const wxString& name = wxStaticBitmapNameStr); long style = 0, const wxString& name = wxStaticBitmapNameStr);
virtual void SetBitmap( const wxBitmap& bitmap ); virtual void SetBitmap( const wxBitmap& bitmap );
wxBitmap& GetBitmap(void) const { return (wxBitmap&)m_bitmap; } wxBitmap& GetBitmap(void) const { return (wxBitmap&)m_bitmap; }

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

@@ -46,10 +46,10 @@ class wxStaticBox: public wxControl
wxStaticBox(void); wxStaticBox(void);
wxStaticBox( wxWindow *parent, wxWindowID id, const wxString &label, wxStaticBox( wxWindow *parent, wxWindowID id, const wxString &label,
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
const long style = 0, const wxString &name = wxStaticBoxNameStr ); long style = 0, const wxString &name = wxStaticBoxNameStr );
bool Create( wxWindow *parent, wxWindowID id, const wxString &label, bool Create( wxWindow *parent, wxWindowID id, const wxString &label,
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
const long style = 0, const wxString &name = wxStaticBoxNameStr ); long style = 0, const wxString &name = wxStaticBoxNameStr );
}; };
#endif // __GTKSTATICBOXH__ #endif // __GTKSTATICBOXH__

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

@@ -46,10 +46,10 @@ class wxStaticText: public wxControl
wxStaticText(void); wxStaticText(void);
wxStaticText( wxWindow *parent, wxWindowID id, const wxString &label, wxStaticText( wxWindow *parent, wxWindowID id, const wxString &label,
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
const long style = 0, const wxString &name = wxStaticTextNameStr ); long style = 0, const wxString &name = wxStaticTextNameStr );
bool Create( wxWindow *parent, wxWindowID id, const wxString &label, bool Create( wxWindow *parent, wxWindowID id, const wxString &label,
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
const long style = 0, const wxString &name = wxStaticTextNameStr ); long style = 0, const wxString &name = wxStaticTextNameStr );
wxString GetLabel(void) const; wxString GetLabel(void) const;
void SetLabel( const wxString &label ); void SetLabel( const wxString &label );
}; };

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

@@ -50,9 +50,9 @@ class wxToolBarTool: public wxObject
public: public:
wxToolBarTool(void) {}; wxToolBarTool(void) {};
wxToolBarTool( wxToolBarGTK *owner, const int theIndex = 0, wxToolBarTool( wxToolBarGTK *owner, int theIndex = 0,
const wxBitmap& bitmap1 = wxNullBitmap, const wxBitmap& bitmap2 = wxNullBitmap, const wxBitmap& bitmap1 = wxNullBitmap, const wxBitmap& bitmap2 = wxNullBitmap,
const bool toggle = FALSE, wxObject *clientData = NULL, bool toggle = FALSE, wxObject *clientData = NULL,
const wxString& shortHelpString = "", const wxString& longHelpString = ""); const wxString& shortHelpString = "", const wxString& longHelpString = "");
~wxToolBarTool(void); ~wxToolBarTool(void);
@@ -84,14 +84,14 @@ class wxToolBarGTK: public wxControl
public: public:
wxToolBarGTK(void); wxToolBarGTK(void);
wxToolBarGTK( wxWindow *parent, const wxWindowID id, wxToolBarGTK( wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
const long style = 0, const wxString& name = wxToolBarNameStr ); long style = 0, const wxString& name = wxToolBarNameStr );
~wxToolBarGTK(void); ~wxToolBarGTK(void);
bool Create( wxWindow *parent, const wxWindowID id, bool Create( wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
const long style = 0, const wxString& name = wxToolBarNameStr); long style = 0, const wxString& name = wxToolBarNameStr);
// Only allow toggle if returns TRUE. Call when left button up. // Only allow toggle if returns TRUE. Call when left button up.
virtual bool OnLeftClick(int toolIndex, bool toggleDown); virtual bool OnLeftClick(int toolIndex, bool toggleDown);
@@ -106,25 +106,25 @@ class wxToolBarGTK: public wxControl
// If pushedBitmap is NULL, a reversed version of bitmap is // If pushedBitmap is NULL, a reversed version of bitmap is
// created and used as the pushed/toggled image. // created and used as the pushed/toggled image.
// 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( const int toolIndex, const wxBitmap& bitmap, virtual wxToolBarTool *AddTool( int toolIndex, const wxBitmap& bitmap,
const wxBitmap& pushedBitmap = wxNullBitmap, const bool toggle = FALSE, const wxBitmap& pushedBitmap = wxNullBitmap, bool toggle = FALSE,
const float xPos = -1, const float yPos = -1, wxObject *clientData = NULL, float xPos = -1, float yPos = -1, wxObject *clientData = 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);
virtual void EnableTool(const int toolIndex, const bool enable); virtual void EnableTool(int toolIndex, bool enable);
virtual void ToggleTool(const int toolIndex, const bool toggle); // toggle is TRUE if toggled on virtual void ToggleTool(int toolIndex, bool toggle); // toggle is TRUE if toggled on
virtual void SetToggle(const int toolIndex, const bool toggle); // Set this to be togglable (or not) virtual void SetToggle(int toolIndex, bool toggle); // Set this to be togglable (or not)
virtual wxObject *GetToolClientData(const int index) const; virtual wxObject *GetToolClientData(int index) const;
virtual bool GetToolState(const int toolIndex) const; virtual bool GetToolState(int toolIndex) const;
virtual bool GetToolEnabled(const int toolIndex) const; virtual bool GetToolEnabled(int toolIndex) const;
virtual void SetMargins(const int x, const int y); virtual void SetMargins(int x, int y);
void SetMargins(const wxSize& size) { SetMargins(size.x, size.y); }; void SetMargins(const wxSize& size) { SetMargins(size.x, size.y); };
virtual void SetToolPacking(const int packing); virtual void SetToolPacking(int packing);
virtual void SetToolSeparation(const int separation); virtual void SetToolSeparation(int separation);
public: public:

34
include/wx/gtk1/textctrl.h
View File

@@ -50,12 +50,12 @@ class wxTextCtrl: public wxControl, public streambuf
public: public:
wxTextCtrl(void); wxTextCtrl(void);
wxTextCtrl( wxWindow *parent, const wxWindowID id, const wxString &value = "", wxTextCtrl( wxWindow *parent, wxWindowID id, const wxString &value = "",
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
const int style = 0, const wxString &name = wxTextCtrlNameStr ); int style = 0, const wxString &name = wxTextCtrlNameStr );
bool Create( wxWindow *parent, const wxWindowID id, const wxString &value = "", bool Create( wxWindow *parent, wxWindowID id, const wxString &value = "",
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
const int style = 0, const wxString &name = wxTextCtrlNameStr ); int style = 0, const wxString &name = wxTextCtrlNameStr );
wxString GetValue(void) const; wxString GetValue(void) const;
void SetValue( const wxString &value ); void SetValue( const wxString &value );
void WriteText( const wxString &text ); void WriteText( const wxString &text );
@@ -65,21 +65,21 @@ class wxTextCtrl: public wxControl, public streambuf
bool IsModified(void); bool IsModified(void);
void DiscardEdits(void); void DiscardEdits(void);
/* /*
wxString GetLineText( const long lineNo ) const; wxString GetLineText( long lineNo ) const;
void OnDropFiles( wxDropFilesEvent &event ); void OnDropFiles( wxDropFilesEvent &event );
long PositionToXY( const long pos, long *x, long *y ) const; long PositionToXY( long pos, long *x, long *y ) const;
long XYToPosition( const long x, const long y ); long XYToPosition( long x, long y );
int GetNumberOfLines(void); int GetNumberOfLines(void);
*/ */
virtual void SetInsertionPoint( const long pos ); virtual void SetInsertionPoint( long pos );
virtual void SetInsertionPointEnd(void); virtual void SetInsertionPointEnd(void);
virtual void SetEditable( const bool editable ); virtual void SetEditable( bool editable );
virtual void SetSelection( const long from, const long to ); virtual void SetSelection( long from, long to );
void ShowPosition( const long pos ); void ShowPosition( long pos );
virtual long GetInsertionPoint(void) const; virtual long GetInsertionPoint(void) const;
virtual long GetLastPosition(void) const; virtual long GetLastPosition(void) const;
virtual void Remove( const long from, const long to ); virtual void Remove( long from, long to );
virtual void Replace( const long from, const long to, const wxString &value ); virtual void Replace( long from, long to, const wxString &value );
void Cut(void); void Cut(void);
void Copy(void); void Copy(void);
void Paste(void); void Paste(void);
@@ -92,10 +92,10 @@ class wxTextCtrl: public wxControl, public streambuf
int underflow(void); int underflow(void);
wxTextCtrl& operator<<(const wxString& s); wxTextCtrl& operator<<(const wxString& s);
wxTextCtrl& operator<<(const int i); wxTextCtrl& operator<<(int i);
wxTextCtrl& operator<<(const long i); wxTextCtrl& operator<<(long i);
wxTextCtrl& operator<<(const float f); wxTextCtrl& operator<<(float f);
wxTextCtrl& operator<<(const double d); wxTextCtrl& operator<<(double d);
wxTextCtrl& operator<<(const char c); wxTextCtrl& operator<<(const char c);
public: public:

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

@@ -63,35 +63,35 @@ class wxWindow: public wxEvtHandler
public: public:
wxWindow(void); wxWindow(void);
wxWindow( wxWindow *parent, const wxWindowID id, wxWindow( wxWindow *parent, wxWindowID id,
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
const long style = 0, const wxString &name = wxPanelNameStr ); long style = 0, const wxString &name = wxPanelNameStr );
bool Create( wxWindow *parent, const wxWindowID id, bool Create( wxWindow *parent, wxWindowID id,
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
const long style = 0, const wxString &name = wxPanelNameStr ); long style = 0, const wxString &name = wxPanelNameStr );
virtual ~wxWindow(void); virtual ~wxWindow(void);
bool Close( const bool force = FALSE ); bool Close( bool force = FALSE );
virtual bool Destroy(void); virtual bool Destroy(void);
virtual bool DestroyChildren(void); virtual bool DestroyChildren(void);
virtual void PrepareDC( wxDC &dc ); virtual void PrepareDC( wxDC &dc );
virtual void SetSize( const int x, const int y, const int width, const int height, virtual void SetSize( int x, int y, int width, int height,
const int sizeFlags = wxSIZE_AUTO ); int sizeFlags = wxSIZE_AUTO );
virtual void SetSize( const int width, const int height ); virtual void SetSize( int width, int height );
virtual void Move( const int x, const int y ); virtual void Move( int x, int y );
virtual void GetSize( int *width, int *height ) const; virtual void GetSize( int *width, int *height ) const;
virtual void SetClientSize( int const width, int const height ); virtual void SetClientSize( int const width, int const height );
virtual void GetClientSize( int *width, int *height ) const; virtual void GetClientSize( int *width, int *height ) const;
virtual void GetPosition( int *x, int *y ) const; virtual void GetPosition( int *x, int *y ) const;
virtual void Centre( const int direction = wxHORIZONTAL ); virtual void Centre( int direction = wxHORIZONTAL );
virtual void Fit(void); virtual void Fit(void);
void OnSize( wxSizeEvent &event ); void OnSize( wxSizeEvent &event );
virtual bool Show( const bool show ); virtual bool Show( bool show );
virtual void Enable( const bool enable ); virtual void Enable( bool enable );
virtual void MakeModal( const bool modal ); virtual void MakeModal( bool modal );
virtual bool IsEnabled(void) const { return m_isEnabled; }; virtual bool IsEnabled(void) const { return m_isEnabled; };
virtual void SetFocus(void); virtual void SetFocus(void);
virtual bool OnClose(void); virtual bool OnClose(void);
@@ -116,10 +116,10 @@ class wxWindow: public wxEvtHandler
void SetCursor( const wxCursor &cursor ); void SetCursor( const wxCursor &cursor );
virtual void Refresh( const bool eraseBackground = TRUE, const wxRect *rect = NULL ); virtual void Refresh( bool eraseBackground = TRUE, const wxRect *rect = NULL );
virtual void Clear(void); virtual void Clear(void);
virtual bool IsExposed( const long x, const long y ); virtual bool IsExposed( long x, long y );
virtual bool IsExposed( const long x, const long y, const long width, const long height ); virtual bool IsExposed( long x, long y, long width, long height );
virtual wxColour GetBackgroundColour(void) const; virtual wxColour GetBackgroundColour(void) const;
virtual void SetBackgroundColour( const wxColour &colour ); virtual void SetBackgroundColour( const wxColour &colour );
@@ -154,7 +154,7 @@ class wxWindow: public wxEvtHandler
virtual bool IsShown(void); virtual bool IsShown(void);
virtual bool IsRetained(void); virtual bool IsRetained(void);
virtual wxWindow *FindWindow( const long id ); virtual wxWindow *FindWindow( long id );
virtual wxWindow *FindWindow( const wxString& name ); virtual wxWindow *FindWindow( const wxString& name );
void AllowDoubleClick( bool WXUNUSED(allow) ) {}; void AllowDoubleClick( bool WXUNUSED(allow) ) {};
void SetDoubleClick( bool WXUNUSED(allow) ) {}; void SetDoubleClick( bool WXUNUSED(allow) ) {};
@@ -170,18 +170,18 @@ class wxWindow: public wxEvtHandler
virtual void SetDropTarget( wxDropTarget *dropTarget ); virtual void SetDropTarget( wxDropTarget *dropTarget );
virtual wxDropTarget *GetDropTarget() const; virtual wxDropTarget *GetDropTarget() const;
virtual void SetScrollbar( const int orient, const int pos, const int thumbVisible, virtual void SetScrollbar( int orient, int pos, int thumbVisible,
const int range, const bool refresh = TRUE ); int range, bool refresh = TRUE );
virtual void SetScrollPos( const int orient, const int pos, const bool refresh = TRUE ); virtual void SetScrollPos( int orient, int pos, bool refresh = TRUE );
virtual int GetScrollPos( const int orient ) const; virtual int GetScrollPos( int orient ) const;
virtual int GetScrollThumb( const int orient ) const; virtual int GetScrollThumb( int orient ) const;
virtual int GetScrollRange( const int orient ) const; virtual int GetScrollRange( int orient ) const;
virtual void ScrollWindow( const int dx, const int dy, const wxRect* rect = NULL ); virtual void ScrollWindow( int dx, int dy, const wxRect* rect = NULL );
public: // cannot get private going yet public: // cannot get private going yet
void PreCreation( wxWindow *parent, const wxWindowID id, const wxPoint &pos, void PreCreation( wxWindow *parent, wxWindowID id, const wxPoint &pos,
const wxSize &size, const long style, const wxString &name ); const wxSize &size, long style, const wxString &name );
void PostCreation(void); void PostCreation(void);
bool HasVMT(void); bool HasVMT(void);
virtual void ImplementSetSize(void); virtual void ImplementSetSize(void);
@@ -230,7 +230,7 @@ class wxWindow: public wxEvtHandler
wxLayoutConstraints *GetConstraints(void) const; wxLayoutConstraints *GetConstraints(void) const;
void SetConstraints( wxLayoutConstraints *constraints ); void SetConstraints( wxLayoutConstraints *constraints );
void SetAutoLayout( const bool autoLayout ); void SetAutoLayout( bool autoLayout );
bool GetAutoLayout(void) const; bool GetAutoLayout(void) const;
bool Layout(void); bool Layout(void);
void SetSizer( wxSizer *sizer ); void SetSizer( wxSizer *sizer );
@@ -243,15 +243,15 @@ class wxWindow: public wxEvtHandler
void RemoveConstraintReference(wxWindow *otherWin); void RemoveConstraintReference(wxWindow *otherWin);
void DeleteRelatedConstraints(void); void DeleteRelatedConstraints(void);
virtual void ResetConstraints(void); virtual void ResetConstraints(void);
virtual void SetConstraintSizes(const bool recurse = TRUE); virtual void SetConstraintSizes(bool recurse = TRUE);
virtual bool LayoutPhase1(int *noChanges); virtual bool LayoutPhase1(int *noChanges);
virtual bool LayoutPhase2(int *noChanges); virtual bool LayoutPhase2(int *noChanges);
virtual bool DoPhase(const int); virtual bool DoPhase(int);
virtual void TransformSizerToActual(int *x, int *y) const ; virtual void TransformSizerToActual(int *x, int *y) const ;
virtual void SizerSetSize(const int x, const int y, const int w, const int h); virtual void SizerSetSize(int x, int y, int w, int h);
virtual void SizerMove(const int x, const int y); virtual void SizerMove(int x, int y);
virtual void SetSizeConstraint(const int x, const int y, const int w, const int h); virtual void SetSizeConstraint(int x, int y, int w, int h);
virtual void MoveConstraint(const int x, const int y); virtual void MoveConstraint(int x, int y);
virtual void GetSizeConstraint(int *w, int *h) const ; virtual void GetSizeConstraint(int *w, int *h) const ;
virtual void GetClientSizeConstraint(int *w, int *h) const ; virtual void GetClientSizeConstraint(int *w, int *h) const ;
virtual void GetPositionConstraint(int *x, int *y) const ; virtual void GetPositionConstraint(int *x, int *y) const ;

24
include/wx/hash.h
View File

@@ -38,10 +38,10 @@ class WXDLLEXPORT wxHashTable: public wxObject
unsigned int key_type; unsigned int key_type;
wxList **hash_table; wxList **hash_table;
wxHashTable(const int the_key_type = wxKEY_INTEGER, const int size = 1000); wxHashTable(int the_key_type = wxKEY_INTEGER, int size = 1000);
~wxHashTable(void); ~wxHashTable(void);
bool Create(const int the_key_type = wxKEY_INTEGER, const int size = 1000); bool Create(int the_key_type = wxKEY_INTEGER, int size = 1000);
// Note that there are 2 forms of Put, Get. // Note that there are 2 forms of Put, Get.
// With a key and a value, the *value* will be checked // With a key and a value, the *value* will be checked
@@ -56,27 +56,27 @@ class WXDLLEXPORT wxHashTable: public wxObject
// e.g. 1 + 2 = 3, 2 + 1 = 3. // e.g. 1 + 2 = 3, 2 + 1 = 3.
// key and value are NOT necessarily the same // key and value are NOT necessarily the same
void Put(const long key, const long value, wxObject *object); void Put(long key, long value, wxObject *object);
void Put(const long key, const char *value, wxObject *object); void Put(long key, const char *value, wxObject *object);
// key and value are the same // key and value are the same
void Put(const long value, wxObject *object); void Put(long value, wxObject *object);
void Put(const char *value, wxObject *object); void Put(const char *value, wxObject *object);
// key and value not the same // key and value not the same
wxObject *Get(const long key, const long value) const; wxObject *Get(long key, long value) const;
wxObject *Get(const long key, const char *value) const; wxObject *Get(long key, const char *value) const;
// key and value are the same // key and value are the same
wxObject *Get(const long value) const; wxObject *Get(long value) const;
wxObject *Get(const char *value) const; wxObject *Get(const char *value) const;
// Deletes entry and returns data if found // Deletes entry and returns data if found
wxObject *Delete(const long key); wxObject *Delete(long key);
wxObject *Delete(const char *key); wxObject *Delete(const char *key);
wxObject *Delete(const long key, const int value); wxObject *Delete(long key, int value);
wxObject *Delete(const long key, const char *value); wxObject *Delete(long key, const char *value);
// Construct your own integer key from a string, e.g. in case // Construct your own integer key from a string, e.g. in case
// you need to combine it with something // you need to combine it with something
@@ -89,7 +89,7 @@ class WXDLLEXPORT wxHashTable: public wxObject
void BeginFind(void); void BeginFind(void);
wxNode *Next(void); wxNode *Next(void);
void DeleteContents(const bool flag); void DeleteContents(bool flag);
void Clear(void); void Clear(void);
}; };

14
include/wx/layout.h
View File

@@ -222,17 +222,17 @@ class WXDLLEXPORT wxSizer: public wxWindow
~wxSizer(void); ~wxSizer(void);
bool Create(wxWindow *parent, wxSizerBehaviour behav = wxSizerNone); bool Create(wxWindow *parent, wxSizerBehaviour behav = wxSizerNone);
virtual void SetSize(const int x, const int y, const int w, const int h, const int flags = wxSIZE_AUTO); virtual void SetSize(int x, int y, int w, int h, int flags = wxSIZE_AUTO);
// Avoid compiler warning // Avoid compiler warning
void SetSize(const int w, const int h) { wxWindow::SetSize(w, h); } void SetSize(int w, int h) { wxWindow::SetSize(w, h); }
virtual void Move(const int x, const int y); virtual void Move(int x, int y);
virtual void GetSize(int *w, int *h) const; virtual void GetSize(int *w, int *h) const;
inline virtual void GetClientSize(int *w, int *h) const { GetSize(w, h); } inline virtual void GetClientSize(int *w, int *h) const { GetSize(w, h); }
virtual void GetPosition(int *x, int *y) const; virtual void GetPosition(int *x, int *y) const;
inline void SizerSetSize(const int x, const int y, const int w, const int h) inline void SizerSetSize(int x, int y, int w, int h)
{ SetSize(x, y, w, h); } { SetSize(x, y, w, h); }
inline void SizerMove(const int x, const int y) inline void SizerMove(int x, int y)
{ Move(x, y); } { Move(x, y); }
virtual void SetBorder(int w, int h); virtual void SetBorder(int w, int h);
@@ -269,9 +269,9 @@ class WXDLLEXPORT wxRowColSizer: public wxSizer
~wxRowColSizer(void); ~wxRowColSizer(void);
bool Create(wxWindow *parent, bool rowOrCol = wxSIZER_ROWS, int rowsOrColSize = 20, wxSizerBehaviour = wxSizerShrink); bool Create(wxWindow *parent, bool rowOrCol = wxSIZER_ROWS, int rowsOrColSize = 20, wxSizerBehaviour = wxSizerShrink);
void SetSize(const int x, const int y, const int w, const int h, const int flags = wxSIZE_AUTO); void SetSize(int x, int y, int w, int h, int flags = wxSIZE_AUTO);
// Avoid compiler warning // Avoid compiler warning
void SetSize(const int w, const int h) { wxSizer::SetSize(w, h); } void SetSize(int w, int h) { wxSizer::SetSize(w, h); }
inline virtual void SetRowOrCol(bool rc) { rowOrCol = rc; } inline virtual void SetRowOrCol(bool rc) { rowOrCol = rc; }
inline virtual bool GetRowOrCol(void) { return rowOrCol; } inline virtual bool GetRowOrCol(void) { return rowOrCol; }

12
include/wx/list.h
View File

@@ -73,7 +73,7 @@ class WXDLLEXPORT wxList: public wxObject
wxList(void); wxList(void);
wxList(const unsigned int the_key_type); wxList(const unsigned int the_key_type);
wxList(const int N, wxObject *Objects[]); wxList(int N, wxObject *Objects[]);
wxList(wxObject *object, ...); wxList(wxObject *object, ...);
#ifdef USE_STORABLE_CLASSES #ifdef USE_STORABLE_CLASSES
@@ -95,7 +95,7 @@ class WXDLLEXPORT wxList: public wxObject
wxNode *Insert(wxNode *position, wxObject *object); wxNode *Insert(wxNode *position, wxObject *object);
// Keyed append // Keyed append
wxNode *Append(const long key, wxObject *object); wxNode *Append(long key, wxObject *object);
wxNode *Append(const char *key, wxObject *object); wxNode *Append(const char *key, wxObject *object);
bool DeleteNode(wxNode *node); bool DeleteNode(wxNode *node);
@@ -106,15 +106,15 @@ class WXDLLEXPORT wxList: public wxObject
inline wxNode *First(void) const { return first_node; } inline wxNode *First(void) const { return first_node; }
inline wxNode *Last(void) const { return last_node; } inline wxNode *Last(void) const { return last_node; }
wxNode *Nth(const int i) const; // nth node counting from 0 wxNode *Nth(int i) const; // nth node counting from 0
// Keyed search // Keyed search
wxNode *Find(const long key) const; wxNode *Find(long key) const;
wxNode *Find(const char *key) const; wxNode *Find(const char *key) const;
wxNode *Member(wxObject *object) const; wxNode *Member(wxObject *object) const;
inline void DeleteContents(const int destroy) { destroy_data = destroy; } inline void DeleteContents(int destroy) { destroy_data = destroy; }
// Instruct it to destroy user data // Instruct it to destroy user data
// when deleting nodes // when deleting nodes
// this function allows the sorting of arbitrary lists by giving // this function allows the sorting of arbitrary lists by giving
@@ -139,7 +139,7 @@ class WXDLLEXPORT wxStringList: public wxList
virtual wxNode *Add(const char *s); virtual wxNode *Add(const char *s);
virtual void Delete(const char *s); virtual void Delete(const char *s);
virtual char **ListToArray(const bool new_copies = FALSE) const; virtual char **ListToArray(bool new_copies = FALSE) const;
virtual void Sort(void); virtual void Sort(void);
virtual bool Member(const char *s) const; virtual bool Member(const char *s) const;
}; };

7
include/wx/msw/app.h
View File

@@ -63,11 +63,6 @@ class WXDLLEXPORT wxApp: public wxEvtHandler
virtual void OnIdle(wxIdleEvent& event); virtual void OnIdle(wxIdleEvent& event);
// Windows specific. Intercept keyboard input.
#if WXWIN_COMPATIBILITY == 2
virtual bool OldOnCharHook(wxKeyEvent& event);
#endif
// Generic // Generic
virtual bool OnInit(void) { return FALSE; }; virtual bool OnInit(void) { return FALSE; };
@@ -111,7 +106,7 @@ class WXDLLEXPORT wxApp: public wxEvtHandler
// Returns TRUE if more idle time is requested. // Returns TRUE if more idle time is requested.
bool SendIdleEvents(wxWindow* win); bool SendIdleEvents(wxWindow* win);
inline void SetAuto3D(const bool flag) { m_auto3D = flag; } inline void SetAuto3D(bool flag) { m_auto3D = flag; }
inline bool GetAuto3D(void) const { return m_auto3D; } inline bool GetAuto3D(void) const { return m_auto3D; }
// Creates a log object // Creates a log object

28
include/wx/msw/bitmap.h
View File

@@ -43,7 +43,7 @@ public:
// Construct a mask from a bitmap and a palette index indicating // Construct a mask from a bitmap and a palette index indicating
// the transparent area // the transparent area
wxMask(const wxBitmap& bitmap, const int paletteIndex); wxMask(const wxBitmap& bitmap, int paletteIndex);
// Construct a mask from a mono bitmap (copies the bitmap). // Construct a mask from a mono bitmap (copies the bitmap).
wxMask(const wxBitmap& bitmap); wxMask(const wxBitmap& bitmap);
@@ -51,7 +51,7 @@ public:
~wxMask(void); ~wxMask(void);
bool Create(const wxBitmap& bitmap, const wxColour& colour); bool Create(const wxBitmap& bitmap, const wxColour& colour);
bool Create(const wxBitmap& bitmap, const int paletteIndex); bool Create(const wxBitmap& bitmap, int paletteIndex);
bool Create(const wxBitmap& bitmap); bool Create(const wxBitmap& bitmap);
// Implementation // Implementation
@@ -95,14 +95,14 @@ class WXDLLEXPORT wxBitmapHandler: public wxObject
public: public:
wxBitmapHandler(void) { m_name = ""; m_extension = ""; m_type = 0; }; wxBitmapHandler(void) { m_name = ""; m_extension = ""; m_type = 0; };
virtual bool Create(wxBitmap *bitmap, void *data, const long flags, const int width, const int height, const int depth = 1); virtual bool Create(wxBitmap *bitmap, void *data, long flags, int width, int height, int depth = 1);
virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, const long flags, virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
int desiredWidth, int desiredHeight); int desiredWidth, int desiredHeight);
virtual bool SaveFile(wxBitmap *bitmap, const wxString& name, const int type, const wxPalette *palette = NULL); virtual bool SaveFile(wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette = NULL);
inline void SetName(const wxString& name) { m_name = name; } inline void SetName(const wxString& name) { m_name = name; }
inline void SetExtension(const wxString& ext) { m_extension = ext; } inline void SetExtension(const wxString& ext) { m_extension = ext; }
inline void SetType(const long type) { m_type = type; } inline void SetType(long type) { m_type = type; }
inline wxString GetName(void) const { return m_name; } inline wxString GetName(void) const { return m_name; }
inline wxString GetExtension(void) const { return m_extension; } inline wxString GetExtension(void) const { return m_extension; }
inline long GetType(void) const { return m_type; } inline long GetType(void) const { return m_type; }
@@ -128,7 +128,7 @@ public:
inline wxBitmap(const wxBitmap* bitmap) { if (bitmap) Ref(*bitmap); if ( wxTheBitmapList ) wxTheBitmapList->AddBitmap(this); } inline wxBitmap(const wxBitmap* bitmap) { if (bitmap) Ref(*bitmap); if ( wxTheBitmapList ) wxTheBitmapList->AddBitmap(this); }
// Initialize with raw data // Initialize with raw data
wxBitmap(const char bits[], const int width, const int height, const int depth = 1); wxBitmap(const char bits[], int width, int height, int depth = 1);
#if USE_XPM_IN_MSW #if USE_XPM_IN_MSW
class wxItem; class wxItem;
@@ -137,19 +137,19 @@ public:
#endif #endif
// Load a file or resource // Load a file or resource
wxBitmap(const wxString& name, const long type = wxBITMAP_TYPE_BMP_RESOURCE); wxBitmap(const wxString& name, long type = wxBITMAP_TYPE_BMP_RESOURCE);
// New constructor for generalised creation from data // New constructor for generalised creation from data
wxBitmap(void *data, const long type, const int width, const int height, const int depth = 1); wxBitmap(void *data, long type, int width, int height, int depth = 1);
// If depth is omitted, will create a bitmap compatible with the display // If depth is omitted, will create a bitmap compatible with the display
wxBitmap(const int width, const int height, const int depth = -1); wxBitmap(int width, int height, int depth = -1);
~wxBitmap(void); ~wxBitmap(void);
virtual bool Create(const int width, const int height, const int depth = -1); virtual bool Create(int width, int height, int depth = -1);
virtual bool Create(void *data, const long type, const int width, const int height, const int depth = 1); virtual bool Create(void *data, long type, int width, int height, int depth = 1);
virtual bool LoadFile(const wxString& name, const long type = wxBITMAP_TYPE_BMP_RESOURCE); virtual bool LoadFile(const wxString& name, long type = wxBITMAP_TYPE_BMP_RESOURCE);
virtual bool SaveFile(const wxString& name, const int type, const wxPalette *cmap = NULL); virtual bool SaveFile(const wxString& name, int type, const wxPalette *cmap = NULL);
inline bool Ok(void) const { return (M_BITMAPDATA && M_BITMAPDATA->m_ok); } inline bool Ok(void) const { return (M_BITMAPDATA && M_BITMAPDATA->m_ok); }
inline int GetWidth(void) const { return (M_BITMAPDATA ? M_BITMAPDATA->m_width : 0); } inline int GetWidth(void) const { return (M_BITMAPDATA ? M_BITMAPDATA->m_width : 0); }

8
include/wx/msw/bmpbuttn.h
View File

@@ -27,18 +27,18 @@ class WXDLLEXPORT wxBitmapButton: public wxButton
DECLARE_DYNAMIC_CLASS(wxBitmapButton) DECLARE_DYNAMIC_CLASS(wxBitmapButton)
public: public:
inline wxBitmapButton(void) { m_marginX = wxDEFAULT_BUTTON_MARGIN; m_marginY = wxDEFAULT_BUTTON_MARGIN; } inline wxBitmapButton(void) { m_marginX = wxDEFAULT_BUTTON_MARGIN; m_marginY = wxDEFAULT_BUTTON_MARGIN; }
inline wxBitmapButton(wxWindow *parent, const wxWindowID id, const wxBitmap& bitmap, inline wxBitmapButton(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const long style = wxBU_AUTODRAW, const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxButtonNameStr) const wxString& name = wxButtonNameStr)
{ {
Create(parent, id, bitmap, pos, size, style, validator, name); Create(parent, id, bitmap, pos, size, style, validator, name);
} }
bool Create(wxWindow *parent, const wxWindowID id, const wxBitmap& bitmap, bool Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const long style = wxBU_AUTODRAW, const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxButtonNameStr); const wxString& name = wxButtonNameStr);

6
include/wx/msw/brush.h
View File

@@ -45,8 +45,8 @@ class WXDLLEXPORT wxBrush: public wxGDIObject
public: public:
wxBrush(void); wxBrush(void);
wxBrush(const wxColour& col, const int style); wxBrush(const wxColour& col, int style);
wxBrush(const wxString& col, const int style); wxBrush(const wxString& col, int style);
wxBrush(const wxBitmap& stipple); wxBrush(const wxBitmap& stipple);
inline wxBrush(const wxBrush& brush) { Ref(brush); } inline wxBrush(const wxBrush& brush) { Ref(brush); }
inline wxBrush(const wxBrush* brush) { /* UnRef(); */ if (brush) Ref(*brush); } inline wxBrush(const wxBrush* brush) { /* UnRef(); */ if (brush) Ref(*brush); }
@@ -55,7 +55,7 @@ public:
virtual void SetColour(const wxColour& col) ; virtual void SetColour(const wxColour& col) ;
virtual void SetColour(const wxString& col) ; virtual void SetColour(const wxString& col) ;
virtual void SetColour(const unsigned char r, const unsigned char g, const unsigned char b) ; virtual void SetColour(const unsigned char r, const unsigned char g, const unsigned char b) ;
virtual void SetStyle(const int style) ; virtual void SetStyle(int style) ;
virtual void SetStipple(const wxBitmap& stipple) ; virtual void SetStipple(const wxBitmap& stipple) ;
inline wxBrush& operator = (const wxBrush& brush) { if (*this == brush) return (*this); Ref(brush); return *this; } inline wxBrush& operator = (const wxBrush& brush) { if (*this == brush) return (*this); Ref(brush); return *this; }

14
include/wx/msw/button.h
View File

@@ -27,28 +27,28 @@ class WXDLLEXPORT wxButton: public wxControl
DECLARE_DYNAMIC_CLASS(wxButton) DECLARE_DYNAMIC_CLASS(wxButton)
public: public:
inline wxButton(void) {} inline wxButton(void) {}
inline wxButton(wxWindow *parent, const wxWindowID id, const wxString& label, inline wxButton(wxWindow *parent, wxWindowID id, const wxString& label,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const long style = 0, const wxSize& size = wxDefaultSize, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxButtonNameStr) const wxString& name = wxButtonNameStr)
{ {
Create(parent, id, label, pos, size, style, validator, name); Create(parent, id, label, pos, size, style, validator, name);
} }
bool Create(wxWindow *parent, const wxWindowID id, const wxString& label, bool Create(wxWindow *parent, wxWindowID id, const wxString& label,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const long style = 0, const wxSize& size = wxDefaultSize, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxButtonNameStr); const wxString& name = wxButtonNameStr);
virtual void SetSize(const int x, const int y, const int width, const int height, const int sizeFlags = wxSIZE_AUTO); virtual void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
virtual void SetDefault(void); virtual void SetDefault(void);
virtual void SetLabel(const wxString& label); virtual void SetLabel(const wxString& label);
virtual wxString GetLabel(void) const ; virtual wxString GetLabel(void) const ;
virtual void Command(wxCommandEvent& event); virtual void Command(wxCommandEvent& event);
virtual bool MSWCommand(const WXUINT param, const WXWORD id); virtual bool MSWCommand(WXUINT param, WXWORD id);
virtual WXHBRUSH OnCtlColor(const WXHDC pDC, const WXHWND pWnd, const WXUINT nCtlColor, virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
WXUINT message, WXWPARAM wParam, WXLPARAM lParam); WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
}; };

28
include/wx/msw/checkbox.h
View File

@@ -28,27 +28,27 @@ class WXDLLEXPORT wxCheckBox: public wxControl
public: public:
inline wxCheckBox(void) { } inline wxCheckBox(void) { }
inline wxCheckBox(wxWindow *parent, const wxWindowID id, const wxString& label, inline wxCheckBox(wxWindow *parent, wxWindowID id, const wxString& label,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const long style = 0, const wxSize& size = wxDefaultSize, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxCheckBoxNameStr) const wxString& name = wxCheckBoxNameStr)
{ {
Create(parent, id, label, pos, size, style, validator, name); Create(parent, id, label, pos, size, style, validator, name);
} }
bool Create(wxWindow *parent, const wxWindowID id, const wxString& label, bool Create(wxWindow *parent, wxWindowID id, const wxString& label,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const long style = 0, const wxSize& size = wxDefaultSize, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxCheckBoxNameStr); const wxString& name = wxCheckBoxNameStr);
virtual void SetValue(const bool); virtual void SetValue(bool);
virtual bool GetValue(void) const ; virtual bool GetValue(void) const ;
virtual void SetSize(const int x, const int y, const int width, const int height, const int sizeFlags = wxSIZE_AUTO); virtual void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
virtual bool MSWCommand(const WXUINT param, const WXWORD id); virtual bool MSWCommand(WXUINT param, WXWORD id);
virtual void SetLabel(const wxString& label); virtual void SetLabel(const wxString& label);
virtual void Command(wxCommandEvent& event); virtual void Command(wxCommandEvent& event);
virtual WXHBRUSH OnCtlColor(const WXHDC pDC, const WXHWND pWnd, const WXUINT nCtlColor, virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
WXUINT message, WXWPARAM wParam, WXLPARAM lParam); WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
}; };
@@ -61,23 +61,23 @@ class WXDLLEXPORT wxBitmapCheckBox: public wxCheckBox
int checkHeight ; int checkHeight ;
inline wxBitmapCheckBox(void) { checkWidth = -1; checkHeight = -1; } inline wxBitmapCheckBox(void) { checkWidth = -1; checkHeight = -1; }
inline wxBitmapCheckBox(wxWindow *parent, const wxWindowID id, const wxBitmap *label, inline wxBitmapCheckBox(wxWindow *parent, wxWindowID id, const wxBitmap *label,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const long style = 0, const wxSize& size = wxDefaultSize, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxCheckBoxNameStr) const wxString& name = wxCheckBoxNameStr)
{ {
Create(parent, id, label, pos, size, style, validator, name); Create(parent, id, label, pos, size, style, validator, name);
} }
bool Create(wxWindow *parent, const wxWindowID id, const wxBitmap *bitmap, bool Create(wxWindow *parent, wxWindowID id, const wxBitmap *bitmap,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const long style = 0, const wxSize& size = wxDefaultSize, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxCheckBoxNameStr); const wxString& name = wxCheckBoxNameStr);
virtual void SetValue(const bool); virtual void SetValue(bool);
virtual bool GetValue(void) const ; virtual bool GetValue(void) const ;
virtual void SetSize(const int x, const int y, const int width, const int height, const int sizeFlags = wxSIZE_AUTO); virtual void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
virtual void SetLabel(const wxBitmap *bitmap); virtual void SetLabel(const wxBitmap *bitmap);
}; };
#endif #endif

6
include/wx/msw/checklst.h
View File

@@ -30,12 +30,12 @@ class wxCheckListBox : public wxListBox
public: public:
// ctors // ctors
wxCheckListBox(); wxCheckListBox();
wxCheckListBox(wxWindow *parent, const wxWindowID id, wxCheckListBox(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
const int nStrings = 0, int nStrings = 0,
const wxString choices[] = NULL, const wxString choices[] = NULL,
const long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxListBoxNameStr); const wxString& name = wxListBoxNameStr);
// const wxFont& font = wxNullFont); // const wxFont& font = wxNullFont);

26
include/wx/msw/choice.h
View File

@@ -30,45 +30,45 @@ class WXDLLEXPORT wxChoice: public wxControl
inline wxChoice(void) { no_strings = 0; } inline wxChoice(void) { no_strings = 0; }
inline wxChoice(wxWindow *parent, const wxWindowID id, inline wxChoice(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
const int n = 0, const wxString choices[] = NULL, int n = 0, const wxString choices[] = NULL,
const long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxChoiceNameStr) const wxString& name = wxChoiceNameStr)
{ {
Create(parent, id, pos, size, n, choices, style, validator, name); Create(parent, id, pos, size, n, choices, style, validator, name);
} }
bool Create(wxWindow *parent, const wxWindowID id, bool Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
const int n = 0, const wxString choices[] = NULL, int n = 0, const wxString choices[] = NULL,
const long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxChoiceNameStr); const wxString& name = wxChoiceNameStr);
virtual void Append(const wxString& item); virtual void Append(const wxString& item);
virtual void Delete(const int n); virtual void Delete(int n);
virtual void Clear(void); virtual void Clear(void);
virtual int GetSelection(void) const ; virtual int GetSelection(void) const ;
virtual void SetSelection(const int n); virtual void SetSelection(int n);
virtual int FindString(const wxString& s) const; virtual int FindString(const wxString& s) const;
virtual wxString GetString(const int n) const ; virtual wxString GetString(int n) const ;
virtual void SetSize(const int x, const int y, const int width, const int height, const int sizeFlags = wxSIZE_AUTO); virtual void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
virtual wxString GetStringSelection(void) const ; virtual wxString GetStringSelection(void) const ;
virtual bool SetStringSelection(const wxString& sel); virtual bool SetStringSelection(const wxString& sel);
virtual inline int Number(void) const { return no_strings; } virtual inline int Number(void) const { return no_strings; }
virtual void Command(wxCommandEvent& event); virtual void Command(wxCommandEvent& event);
virtual bool MSWCommand(const WXUINT param, const WXWORD id); virtual bool MSWCommand(WXUINT param, WXWORD id);
virtual inline void SetColumns(const int WXUNUSED(n) = 1 ) { /* No effect */ } ; virtual inline void SetColumns(int WXUNUSED(n) = 1 ) { /* No effect */ } ;
virtual inline int GetColumns(void) const { return 1 ; }; virtual inline int GetColumns(void) const { return 1 ; };
virtual WXHBRUSH OnCtlColor(const WXHDC pDC, const WXHWND pWnd, const WXUINT nCtlColor, virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
WXUINT message, WXWPARAM wParam, WXLPARAM lParam); WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);

24
include/wx/msw/combobox.h
View File

@@ -31,24 +31,24 @@ class WXDLLEXPORT wxComboBox: public wxChoice
public: public:
inline wxComboBox(void) {} inline wxComboBox(void) {}
inline wxComboBox(wxWindow *parent, const wxWindowID id, inline wxComboBox(wxWindow *parent, wxWindowID id,
const wxString& value = wxEmptyString, const wxString& value = wxEmptyString,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
const int n = 0, const wxString choices[] = NULL, int n = 0, const wxString choices[] = NULL,
const long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxComboBoxNameStr) const wxString& name = wxComboBoxNameStr)
{ {
Create(parent, id, value, pos, size, n, choices, style, validator, name); Create(parent, id, value, pos, size, n, choices, style, validator, name);
} }
bool Create(wxWindow *parent, const wxWindowID id, bool Create(wxWindow *parent, wxWindowID id,
const wxString& value = wxEmptyString, const wxString& value = wxEmptyString,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
const int n = 0, const wxString choices[] = NULL, int n = 0, const wxString choices[] = NULL,
const long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxComboBoxNameStr); const wxString& name = wxComboBoxNameStr);
@@ -62,16 +62,16 @@ class WXDLLEXPORT wxComboBox: public wxChoice
virtual void Copy(void); virtual void Copy(void);
virtual void Cut(void); virtual void Cut(void);
virtual void Paste(void); virtual void Paste(void);
virtual void SetInsertionPoint(const long pos); virtual void SetInsertionPoint(long pos);
virtual void SetInsertionPointEnd(void); virtual void SetInsertionPointEnd(void);
virtual long GetInsertionPoint(void) const ; virtual long GetInsertionPoint(void) const ;
virtual long GetLastPosition(void) const ; virtual long GetLastPosition(void) const ;
virtual void Replace(const long from, const long to, const wxString& value); virtual void Replace(long from, long to, const wxString& value);
virtual void Remove(const long from, const long to); virtual void Remove(long from, long to);
virtual void SetSelection(const long from, const long to); virtual void SetSelection(long from, long to);
virtual void SetEditable(const bool editable); virtual void SetEditable(bool editable);
virtual bool MSWCommand(const WXUINT param, const WXWORD id); virtual bool MSWCommand(WXUINT param, WXWORD id);
}; };
#endif // USE_COMBOBOX #endif // USE_COMBOBOX

8
include/wx/msw/control.h
View File

@@ -31,7 +31,7 @@ public:
virtual void Command(wxCommandEvent& WXUNUSED(event)) = 0; // Simulates an event virtual void Command(wxCommandEvent& WXUNUSED(event)) = 0; // Simulates an event
virtual void ProcessCommand(wxCommandEvent& event); // Calls the callback and virtual void ProcessCommand(wxCommandEvent& event); // Calls the callback and
// appropriate event handlers // appropriate event handlers
virtual void SetClientSize(const int width, const int height); virtual void SetClientSize(int width, int height);
virtual void SetLabel(const wxString& label); virtual void SetLabel(const wxString& label);
virtual wxString GetLabel(void) const ; virtual wxString GetLabel(void) const ;
@@ -46,15 +46,15 @@ public:
#endif #endif
// Places item in centre of panel - so can't be used BEFORE panel->Fit() // Places item in centre of panel - so can't be used BEFORE panel->Fit()
void Centre(const int direction = wxHORIZONTAL); void Centre(int direction = wxHORIZONTAL);
inline void Callback(const wxFunction function); // Adds callback inline void Callback(const wxFunction function); // Adds callback
// MSW-specific // MSW-specific
// Window procedure // Window procedure
virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
virtual void MSWOnMouseMove(const int x, const int y, const WXUINT flags); virtual void MSWOnMouseMove(int x, int y, WXUINT flags);
virtual bool MSWNotify(const WXWPARAM wParam, const WXLPARAM lParam); virtual bool MSWNotify(WXWPARAM wParam, WXLPARAM lParam);
void OnEraseBackground(wxEraseEvent& event); void OnEraseBackground(wxEraseEvent& event);

8
include/wx/msw/cursor.h
View File

@@ -46,11 +46,11 @@ public:
inline wxCursor(const wxCursor& cursor) { Ref(cursor); } inline wxCursor(const wxCursor& cursor) { Ref(cursor); }
inline wxCursor(const wxCursor* cursor) { /* UnRef(); */ if (cursor) Ref(*cursor); } inline wxCursor(const wxCursor* cursor) { /* UnRef(); */ if (cursor) Ref(*cursor); }
wxCursor(const char bits[], const int width, const int height, const int hotSpotX = -1, const int hotSpotY = -1, wxCursor(const char bits[], int width, int height, int hotSpotX = -1, int hotSpotY = -1,
const char maskBits[] = NULL); const char maskBits[] = NULL);
wxCursor(const wxString& name, const long flags = wxBITMAP_TYPE_CUR_RESOURCE, wxCursor(const wxString& name, long flags = wxBITMAP_TYPE_CUR_RESOURCE,
const int hotSpotX = 0, const int hotSpotY = 0); int hotSpotX = 0, int hotSpotY = 0);
wxCursor(const int cursor_type); wxCursor(int cursor_type);
~wxCursor(void); ~wxCursor(void);
virtual bool Ok(void) const { return (m_refData != NULL && M_CURSORDATA->m_hCursor) ; } virtual bool Ok(void) const { return (m_refData != NULL && M_CURSORDATA->m_hCursor) ; }

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

@@ -24,7 +24,7 @@ class WXDLLEXPORT wxPrinterDC: public wxDC
DECLARE_CLASS(wxPrinterDC) DECLARE_CLASS(wxPrinterDC)
// Create a printer DC // Create a printer DC
wxPrinterDC(const wxString& driver, const wxString& device, const wxString& output, const bool interactive = TRUE, const int orientation = wxPORTRAIT); wxPrinterDC(const wxString& driver, const wxString& device, const wxString& output, bool interactive = TRUE, int orientation = wxPORTRAIT);
wxPrinterDC(WXHDC theDC); wxPrinterDC(WXHDC theDC);
~wxPrinterDC(void); ~wxPrinterDC(void);

26
include/wx/msw/dialog.h
View File

@@ -33,8 +33,8 @@ public:
// Constructor with a modal flag, but no window id - the old convention // Constructor with a modal flag, but no window id - the old convention
inline wxDialog(wxWindow *parent, inline wxDialog(wxWindow *parent,
const wxString& title, bool modal, const wxString& title, bool modal,
const int x = -1, const int y= -1, const int width = 500, const int height = 500, int x = -1, int y= -1, int width = 500, int height = 500,
const long style = wxDEFAULT_DIALOG_STYLE, long style = wxDEFAULT_DIALOG_STYLE,
const wxString& name = wxDialogNameStr) const wxString& name = wxDialogNameStr)
{ {
long modalStyle = modal ? wxDIALOG_MODAL : wxDIALOG_MODELESS ; long modalStyle = modal ? wxDIALOG_MODAL : wxDIALOG_MODELESS ;
@@ -42,32 +42,32 @@ public:
} }
// Constructor with no modal flag - the new convention. // Constructor with no modal flag - the new convention.
inline wxDialog(wxWindow *parent, const wxWindowID id, inline wxDialog(wxWindow *parent, wxWindowID id,
const wxString& title, const wxString& title,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
const long style = wxDEFAULT_DIALOG_STYLE, long style = wxDEFAULT_DIALOG_STYLE,
const wxString& name = wxDialogNameStr) const wxString& name = wxDialogNameStr)
{ {
Create(parent, id, title, pos, size, style, name); Create(parent, id, title, pos, size, style, name);
} }
bool Create(wxWindow *parent, const wxWindowID id, bool Create(wxWindow *parent, wxWindowID id,
const wxString& title, // bool modal = FALSE, // TODO make this a window style? const wxString& title, // bool modal = FALSE, // TODO make this a window style?
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
const long style = wxDEFAULT_DIALOG_STYLE, long style = wxDEFAULT_DIALOG_STYLE,
const wxString& name = wxDialogNameStr); const wxString& name = wxDialogNameStr);
~wxDialog(void); ~wxDialog(void);
virtual bool Destroy(void); virtual bool Destroy(void);
void SetSize(const int x, const int y, const int width, const int height, const int sizeFlags = wxSIZE_AUTO); void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
void SetClientSize(const int width, const int height); void SetClientSize(int width, int height);
void GetPosition(int *x, int *y) const; void GetPosition(int *x, int *y) const;
bool Show(const bool show); bool Show(bool show);
bool IsShown(void) const ; bool IsShown(void) const ;
void Iconize(const bool iconize); void Iconize(bool iconize);
#if WXWIN_COMPATIBILITY #if WXWIN_COMPATIBILITY
inline bool Iconized(void) const { return IsIconized(); }; inline bool Iconized(void) const { return IsIconized(); };
@@ -84,9 +84,9 @@ public:
void OnPaint(wxPaintEvent& event); void OnPaint(wxPaintEvent& event);
void OnCloseWindow(wxCloseEvent& event); void OnCloseWindow(wxCloseEvent& event);
void SetModal(const bool flag); void SetModal(bool flag);
virtual void Centre(const int direction = wxBOTH); virtual void Centre(int direction = wxBOTH);
virtual bool IsModal(void) const { return ((GetWindowStyleFlag() & wxDIALOG_MODAL) == wxDIALOG_MODAL); } virtual bool IsModal(void) const { return ((GetWindowStyleFlag() & wxDIALOG_MODAL) == wxDIALOG_MODAL); }
// For now, same as Show(TRUE) but returns return code // For now, same as Show(TRUE) but returns return code
@@ -108,7 +108,7 @@ public:
// virtual bool MSWOnEraseBkgnd(WXHDC pDC); // virtual bool MSWOnEraseBkgnd(WXHDC pDC);
virtual bool MSWOnClose(void); virtual bool MSWOnClose(void);
inline bool IsModalShowing() const { return m_modalShowing ; } inline bool IsModalShowing() const { return m_modalShowing ; }
virtual WXHBRUSH OnCtlColor(const WXHDC pDC, const WXHWND pWnd, const WXUINT nCtlColor, virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
WXUINT message, WXWPARAM wParam, WXLPARAM lParam); WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()

4
include/wx/msw/filedlg.h
View File

@@ -75,8 +75,8 @@ char* WXDLLEXPORT wxFileSelector(const char *message = wxFileSelectorPromptStr,
// An extended version of wxFileSelector // An extended version of wxFileSelector
char* WXDLLEXPORT wxFileSelectorEx(const char *message = wxFileSelectorPromptStr, const char *default_path = NULL, char* WXDLLEXPORT wxFileSelectorEx(const char *message = wxFileSelectorPromptStr, const char *default_path = NULL,
const char *default_filename = NULL, int *indexDefaultExtension = NULL, const char *default_filename = NULL, int *indexDefaultExtension = NULL,
const char *wildcard = wxFileSelectorDefaultWildcardStr, const int flags = 0, const char *wildcard = wxFileSelectorDefaultWildcardStr, int flags = 0,
wxWindow *parent = NULL, const int x = -1, const int y = -1); wxWindow *parent = NULL, int x = -1, int y = -1);
// Generic file load dialog // Generic file load dialog
char* WXDLLEXPORT wxLoadFileSelector(const char *what, const char *extension, const char *default_name = NULL, wxWindow *parent = NULL); char* WXDLLEXPORT wxLoadFileSelector(const char *what, const char *extension, const char *default_name = NULL, wxWindow *parent = NULL);

10
include/wx/msw/font.h
View File

@@ -82,12 +82,12 @@ public:
wxString GetWeightString(void) const ; wxString GetWeightString(void) const ;
inline bool GetUnderlined(void) const { return M_FONTDATA->m_underlined; } inline bool GetUnderlined(void) const { return M_FONTDATA->m_underlined; }
void SetPointSize(const int pointSize); void SetPointSize(int pointSize);
void SetFamily(const int family); void SetFamily(int family);
void SetStyle(const int style); void SetStyle(int style);
void SetWeight(const int weight); void SetWeight(int weight);
void SetFaceName(const wxString& faceName); void SetFaceName(const wxString& faceName);
void SetUnderlined(const bool underlined); void SetUnderlined(bool underlined);
inline wxFont& operator = (const wxFont& font) { if (*this == font) return (*this); Ref(font); return *this; } inline wxFont& operator = (const wxFont& font) { if (*this == font) return (*this); Ref(font); return *this; }
inline bool operator == (const wxFont& font) { return m_refData == font.m_refData; } inline bool operator == (const wxFont& font) { return m_refData == font.m_refData; }

40
include/wx/msw/frame.h
View File

@@ -30,11 +30,11 @@ class WXDLLEXPORT wxFrame: public wxWindow {
public: public:
wxFrame(void); wxFrame(void);
inline wxFrame(wxWindow *parent, inline wxFrame(wxWindow *parent,
const wxWindowID id, wxWindowID id,
const wxString& title, const wxString& title,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
const long style = wxDEFAULT_FRAME_STYLE, long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = wxFrameNameStr) const wxString& name = wxFrameNameStr)
{ {
Create(parent, id, title, pos, size, style, name); Create(parent, id, title, pos, size, style, name);
@@ -43,14 +43,15 @@ public:
~wxFrame(void); ~wxFrame(void);
bool Create(wxWindow *parent, bool Create(wxWindow *parent,
const wxWindowID id, wxWindowID id,
const wxString& title, const wxString& title,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
const long style = wxDEFAULT_FRAME_STYLE, long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = wxFrameNameStr); const wxString& name = wxFrameNameStr);
#if WXWIN_COMPATIBILITY #if WXWIN_COMPATIBILITY
/*
// The default thing is to set the focus for the first child window. // The default thing is to set the focus for the first child window.
// Override for your own behaviour. // Override for your own behaviour.
virtual void OldOnActivate(bool flag); virtual void OldOnActivate(bool flag);
@@ -60,15 +61,16 @@ public:
inline virtual void OldOnMenuCommand(int WXUNUSED(id)) {}; // Called on frame menu command inline virtual void OldOnMenuCommand(int WXUNUSED(id)) {}; // Called on frame menu command
void OldOnSize(int x, int y); void OldOnSize(int x, int y);
*/
#endif #endif
virtual bool Destroy(void); virtual bool Destroy(void);
void SetClientSize(const int width, const int height); void SetClientSize(int width, int height);
void GetClientSize(int *width, int *height) const; void GetClientSize(int *width, int *height) const;
void GetSize(int *width, int *height) const ; void GetSize(int *width, int *height) const ;
void GetPosition(int *x, int *y) const ; void GetPosition(int *x, int *y) const ;
void SetSize(const int x, const int y, const int width, const int height, const int sizeFlags = wxSIZE_AUTO); void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
void OnSize(wxSizeEvent& event); void OnSize(wxSizeEvent& event);
void OnMenuHighlight(wxMenuEvent& event); void OnMenuHighlight(wxMenuEvent& event);
@@ -76,7 +78,7 @@ public:
void OnIdle(wxIdleEvent& event); void OnIdle(wxIdleEvent& event);
void OnCloseWindow(wxCloseEvent& event); void OnCloseWindow(wxCloseEvent& event);
bool Show(const bool show); bool Show(bool show);
// Set menu bar // Set menu bar
void SetMenuBar(wxMenuBar *menu_bar); void SetMenuBar(wxMenuBar *menu_bar);
@@ -86,7 +88,7 @@ public:
void SetTitle(const wxString& title); void SetTitle(const wxString& title);
wxString GetTitle(void) const ; wxString GetTitle(void) const ;
void Centre(const int direction = wxBOTH); void Centre(int direction = wxBOTH);
// Call this to simulate a menu command // Call this to simulate a menu command
virtual void Command(int id); virtual void Command(int id);
@@ -96,14 +98,14 @@ public:
virtual void SetIcon(const wxIcon& icon); virtual void SetIcon(const wxIcon& icon);
// Create status line // Create status line
virtual bool CreateStatusBar(const int number=1); virtual bool CreateStatusBar(int number=1);
inline wxStatusBar *GetStatusBar() const { return m_frameStatusBar; } inline wxStatusBar *GetStatusBar() const { return m_frameStatusBar; }
// Set status line text // Set status line text
virtual void SetStatusText(const wxString& text, const int number = 0); virtual void SetStatusText(const wxString& text, int number = 0);
// Set status line widths // Set status line widths
virtual void SetStatusWidths(const int n, const int *widths_field); virtual void SetStatusWidths(int n, int *widths_field);
// Hint to tell framework which status bar to use // Hint to tell framework which status bar to use
// TODO: should this go into a wxFrameworkSettings class perhaps? // TODO: should this go into a wxFrameworkSettings class perhaps?
@@ -114,18 +116,18 @@ public:
virtual void Fit(void); virtual void Fit(void);
// Iconize // Iconize
virtual void Iconize(const bool iconize); virtual void Iconize(bool iconize);
virtual bool IsIconized(void) const ; virtual bool IsIconized(void) const ;
// Compatibility // Compatibility
inline bool Iconized(void) const { return IsIconized(); } inline bool Iconized(void) const { return IsIconized(); }
virtual void Maximize(const bool maximize); virtual void Maximize(bool maximize);
virtual bool LoadAccelerators(const wxString& table); virtual bool LoadAccelerators(const wxString& table);
virtual void PositionStatusBar(void); virtual void PositionStatusBar(void);
virtual wxStatusBar *OnCreateStatusBar(const int number); virtual wxStatusBar *OnCreateStatusBar(int number);
// Query app for menu item updates (called from OnIdle) // Query app for menu item updates (called from OnIdle)
void DoMenuUpdates(void); void DoMenuUpdates(void);
@@ -139,13 +141,13 @@ public:
// Handlers // Handlers
bool MSWOnPaint(void); bool MSWOnPaint(void);
WXHICON MSWOnQueryDragIcon(void); WXHICON MSWOnQueryDragIcon(void);
void MSWOnSize(const int x, const int y, const WXUINT flag); void MSWOnSize(int x, int y, WXUINT flag);
bool MSWOnCommand(const WXWORD id, const WXWORD cmd, const WXHWND control); bool MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND control);
bool MSWOnClose(void); bool MSWOnClose(void);
void MSWOnMenuHighlight(const WXWORD item, const WXWORD flags, const WXHMENU sysmenu); void MSWOnMenuHighlight(WXWORD item, WXWORD flags, WXHMENU sysmenu);
bool MSWProcessMessage(WXMSG *msg); bool MSWProcessMessage(WXMSG *msg);
void MSWCreate(const int id, wxWindow *parent, const char *WXUNUSED(wclass), wxWindow *wx_win, const char *title, void MSWCreate(int id, wxWindow *parent, const char *WXUNUSED(wclass), wxWindow *wx_win, const char *title,
const int x, const int y, const int width, const int height, const long style); int x, int y, int width, int height, long style);
protected: protected:
wxMenuBar * m_frameMenuBar; wxMenuBar * m_frameMenuBar;

22
include/wx/msw/gauge95.h
View File

@@ -27,29 +27,29 @@ class WXDLLEXPORT wxGauge95: public wxControl
public: public:
inline wxGauge95(void) { m_rangeMax = 0; m_gaugePos = 0; } inline wxGauge95(void) { m_rangeMax = 0; m_gaugePos = 0; }
inline wxGauge95(wxWindow *parent, const wxWindowID id, inline wxGauge95(wxWindow *parent, wxWindowID id,
const int range, int range,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
const long style = wxGA_HORIZONTAL, long style = wxGA_HORIZONTAL,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxGaugeNameStr) const wxString& name = wxGaugeNameStr)
{ {
Create(parent, id, range, pos, size, style, validator, name); Create(parent, id, range, pos, size, style, validator, name);
} }
bool Create(wxWindow *parent, const wxWindowID id, bool Create(wxWindow *parent, wxWindowID id,
const int range, int range,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
const long style = wxGA_HORIZONTAL, long style = wxGA_HORIZONTAL,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxGaugeNameStr); const wxString& name = wxGaugeNameStr);
void SetShadowWidth(const int w); void SetShadowWidth(int w);
void SetBezelFace(const int w); void SetBezelFace(int w);
void SetRange(const int r); void SetRange(int r);
void SetValue(const int pos); void SetValue(int pos);
int GetShadowWidth(void) const ; int GetShadowWidth(void) const ;
int GetBezelFace(void) const ; int GetBezelFace(void) const ;
@@ -64,7 +64,7 @@ class WXDLLEXPORT wxGauge95: public wxControl
inline void SetButtonColour(const wxColour& col) { SetForegroundColour(col); } inline void SetButtonColour(const wxColour& col) { SetForegroundColour(col); }
#endif #endif
void SetSize(const int x, const int y, const int width, const int height, const int sizeFlags = wxSIZE_AUTO); void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
virtual void Command(wxCommandEvent& WXUNUSED(event)) {} ; virtual void Command(wxCommandEvent& WXUNUSED(event)) {} ;

22
include/wx/msw/gaugemsw.h
View File

@@ -27,29 +27,29 @@ class WXDLLEXPORT wxGaugeMSW: public wxControl
public: public:
inline wxGaugeMSW(void) { m_rangeMax = 0; m_gaugePos = 0; } inline wxGaugeMSW(void) { m_rangeMax = 0; m_gaugePos = 0; }
inline wxGaugeMSW(wxWindow *parent, const wxWindowID id, inline wxGaugeMSW(wxWindow *parent, wxWindowID id,
const int range, int range,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
const long style = wxGA_HORIZONTAL, long style = wxGA_HORIZONTAL,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxGaugeNameStr) const wxString& name = wxGaugeNameStr)
{ {
Create(parent, id, range, pos, size, style, validator, name); Create(parent, id, range, pos, size, style, validator, name);
} }
bool Create(wxWindow *parent, const wxWindowID id, bool Create(wxWindow *parent, wxWindowID id,
const int range, int range,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
const long style = wxGA_HORIZONTAL, long style = wxGA_HORIZONTAL,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxGaugeNameStr); const wxString& name = wxGaugeNameStr);
void SetShadowWidth(const int w); void SetShadowWidth(int w);
void SetBezelFace(const int w); void SetBezelFace(int w);
void SetRange(const int r); void SetRange(int r);
void SetValue(const int pos); void SetValue(int pos);
int GetShadowWidth(void) const ; int GetShadowWidth(void) const ;
int GetBezelFace(void) const ; int GetBezelFace(void) const ;
@@ -64,7 +64,7 @@ class WXDLLEXPORT wxGaugeMSW: public wxControl
inline void SetButtonColour(const wxColour& col) { SetForegroundColour(col); } inline void SetButtonColour(const wxColour& col) { SetForegroundColour(col); }
#endif #endif
void SetSize(const int x, const int y, const int width, const int height, const int sizeFlags = wxSIZE_AUTO); void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
virtual void Command(wxCommandEvent& WXUNUSED(event)) {} ; virtual void Command(wxCommandEvent& WXUNUSED(event)) {} ;

10
include/wx/msw/icon.h
View File

@@ -45,12 +45,12 @@ public:
inline wxIcon(const wxIcon& icon) { Ref(icon); } inline wxIcon(const wxIcon& icon) { Ref(icon); }
inline wxIcon(const wxIcon* icon) { /* UnRef(); */ if (icon) Ref(*icon); } inline wxIcon(const wxIcon* icon) { /* UnRef(); */ if (icon) Ref(*icon); }
wxIcon(const char bits[], const int width, const int height); wxIcon(const char bits[], int width, int height);
wxIcon(const wxString& name, const long flags = wxBITMAP_TYPE_ICO_RESOURCE, wxIcon(const wxString& name, long flags = wxBITMAP_TYPE_ICO_RESOURCE,
int desiredWidth = -1, int desiredHeight = -1); int desiredWidth = -1, int desiredHeight = -1);
~wxIcon(void); ~wxIcon(void);
bool LoadFile(const wxString& name, const long flags = wxBITMAP_TYPE_ICO_RESOURCE, bool LoadFile(const wxString& name, long flags = wxBITMAP_TYPE_ICO_RESOURCE,
int desiredWidth = -1, int desiredHeight = -1); int desiredWidth = -1, int desiredHeight = -1);
inline wxIcon& operator = (const wxIcon& icon) { if (*this == icon) return (*this); Ref(icon); return *this; } inline wxIcon& operator = (const wxIcon& icon) { if (*this == icon) return (*this); Ref(icon); return *this; }
@@ -78,7 +78,7 @@ public:
m_type = wxBITMAP_TYPE_ICO; m_type = wxBITMAP_TYPE_ICO;
}; };
virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, const long flags, virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
int desiredWidth = -1, int desiredHeight = -1); int desiredWidth = -1, int desiredHeight = -1);
}; };
@@ -93,7 +93,7 @@ public:
m_type = wxBITMAP_TYPE_ICO_RESOURCE; m_type = wxBITMAP_TYPE_ICO_RESOURCE;
}; };
virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, const long flags, virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
int desiredWidth = -1, int desiredHeight = -1); int desiredWidth = -1, int desiredHeight = -1);
}; };

24
include/wx/msw/imaglist.h
View File

@@ -63,7 +63,7 @@ class WXDLLEXPORT wxImageList: public wxObject
// Specify the width and height of the images in the list, // Specify the width and height of the images in the list,
// whether there are masks associated with them (e.g. if creating images // whether there are masks associated with them (e.g. if creating images
// from icons), and the initial size of the list. // from icons), and the initial size of the list.
inline wxImageList(const int width, const int height, const bool mask = TRUE, const int initialCount = 1) inline wxImageList(int width, int height, bool mask = TRUE, int initialCount = 1)
{ {
Create(width, height, mask, initialCount); Create(width, height, mask, initialCount);
} }
@@ -83,7 +83,7 @@ class WXDLLEXPORT wxImageList: public wxObject
// width, height specify the size of the images in the list (all the same). // width, height specify the size of the images in the list (all the same).
// mask specifies whether the images have masks or not. // mask specifies whether the images have masks or not.
// initialNumber is the initial number of images to reserve. // initialNumber is the initial number of images to reserve.
bool Create(const int width, const int height, const bool mask = TRUE, const int initialNumber = 1); bool Create(int width, int height, bool mask = TRUE, int initialNumber = 1);
// Adds a bitmap, and optionally a mask bitmap. // Adds a bitmap, and optionally a mask bitmap.
// Note that wxImageList creates *new* bitmaps, so you may delete // Note that wxImageList creates *new* bitmaps, so you may delete
@@ -101,21 +101,21 @@ class WXDLLEXPORT wxImageList: public wxObject
// Replaces a bitmap, optionally passing a mask bitmap. // Replaces a bitmap, optionally passing a mask bitmap.
// Note that wxImageList creates new bitmaps, so you may delete // Note that wxImageList creates new bitmaps, so you may delete
// 'bitmap' and 'mask' after calling Replace. // 'bitmap' and 'mask' after calling Replace.
bool Replace(const int index, const wxBitmap& bitmap, const wxBitmap& mask = wxNullBitmap); bool Replace(int index, const wxBitmap& bitmap, const wxBitmap& mask = wxNullBitmap);
/* Not supported by Win95 /* Not supported by Win95
// Replacing a bitmap, using the specified colour to create the mask bitmap // Replacing a bitmap, using the specified colour to create the mask bitmap
// Note that wxImageList creates new bitmaps, so you may delete // Note that wxImageList creates new bitmaps, so you may delete
// 'bitmap'. // 'bitmap'.
bool Replace(const int index, const wxBitmap& bitmap, const wxColour& maskColour); bool Replace(int index, const wxBitmap& bitmap, const wxColour& maskColour);
*/ */
// Replaces a bitmap and mask from an icon. // Replaces a bitmap and mask from an icon.
// You can delete 'icon' after calling Replace. // You can delete 'icon' after calling Replace.
bool Replace(const int index, const wxIcon& icon); bool Replace(int index, const wxIcon& icon);
// Removes the image at the given index. // Removes the image at the given index.
bool Remove(const int index); bool Remove(int index);
// Remove all images // Remove all images
bool RemoveAll(void); bool RemoveAll(void);
@@ -124,13 +124,13 @@ class WXDLLEXPORT wxImageList: public wxObject
// If 'solidBackground' is TRUE, Draw sets the image list background // If 'solidBackground' is TRUE, Draw sets the image list background
// colour to the background colour of the wxDC, to speed up // colour to the background colour of the wxDC, to speed up
// drawing by eliminating masked drawing where possible. // drawing by eliminating masked drawing where possible.
bool Draw(const int index, wxDC& dc, const int x, const int y, bool Draw(int index, wxDC& dc, int x, int y,
const int flags = wxIMAGELIST_DRAW_NORMAL, const bool solidBackground = FALSE); int flags = wxIMAGELIST_DRAW_NORMAL, bool solidBackground = FALSE);
// TODO: miscellaneous functionality // TODO: miscellaneous functionality
/* /*
wxIcon *MakeIcon(const int index); wxIcon *MakeIcon(int index);
bool SetOverlayImage(const int index, const int overlayMask); bool SetOverlayImage(int index, int overlayMask);
*/ */
@@ -139,7 +139,7 @@ class WXDLLEXPORT wxImageList: public wxObject
#if 0 #if 0
// Creates a new drag image by combining the given image (typically a mouse cursor image) // Creates a new drag image by combining the given image (typically a mouse cursor image)
// with the current drag image. // with the current drag image.
bool SetDragCursorImage(const int index, const wxPoint& hotSpot); bool SetDragCursorImage(int index, const wxPoint& hotSpot);
// If successful, returns a pointer to the temporary image list that is used for dragging; // If successful, returns a pointer to the temporary image list that is used for dragging;
// otherwise, NULL. // otherwise, NULL.
@@ -152,7 +152,7 @@ class WXDLLEXPORT wxImageList: public wxObject
// current cursor. In response to subsequent mouse move messages, you can move the drag image // current cursor. In response to subsequent mouse move messages, you can move the drag image
// by using the DragMove member function. To end the drag operation, you can use the EndDrag // by using the DragMove member function. To end the drag operation, you can use the EndDrag
// member function. // member function.
bool BeginDrag(const int index, const wxPoint& hotSpot); bool BeginDrag(int index, const wxPoint& hotSpot);
// Ends a drag operation. // Ends a drag operation.
bool EndDrag(void); bool EndDrag(void);

42
include/wx/msw/listbox.h
View File

@@ -41,28 +41,28 @@ class WXDLLEXPORT wxListBox: public wxControl
public: public:
wxListBox(void); wxListBox(void);
inline wxListBox(wxWindow *parent, const wxWindowID id, inline wxListBox(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
const int n = 0, const wxString choices[] = NULL, int n = 0, const wxString choices[] = NULL,
const long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxListBoxNameStr) const wxString& name = wxListBoxNameStr)
{ {
Create(parent, id, pos, size, n, choices, style, validator, name); Create(parent, id, pos, size, n, choices, style, validator, name);
} }
bool Create(wxWindow *parent, const wxWindowID id, bool Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
const int n = 0, const wxString choices[] = NULL, int n = 0, const wxString choices[] = NULL,
const long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxListBoxNameStr); const wxString& name = wxListBoxNameStr);
~wxListBox(); ~wxListBox();
bool MSWCommand(const WXUINT param, const WXWORD id); bool MSWCommand(WXUINT param, WXWORD id);
#if USE_OWNER_DRAWN #if USE_OWNER_DRAWN
bool MSWOnMeasure(WXMEASUREITEMSTRUCT *item); bool MSWOnMeasure(WXMEASUREITEMSTRUCT *item);
@@ -77,35 +77,35 @@ class WXDLLEXPORT wxListBox: public wxControl
virtual void Append(const wxString& item); virtual void Append(const wxString& item);
virtual void Append(const wxString& item, char *clientData); virtual void Append(const wxString& item, char *clientData);
virtual void Set(const int n, const wxString* choices, char **clientData = NULL); virtual void Set(int n, const wxString* choices, char **clientData = NULL);
virtual int FindString(const wxString& s) const ; virtual int FindString(const wxString& s) const ;
virtual void Clear(void); virtual void Clear(void);
virtual void SetSelection(const int n, const bool select = TRUE); virtual void SetSelection(int n, bool select = TRUE);
virtual void Deselect(const int n); virtual void Deselect(int n);
// For single choice list item only // For single choice list item only
virtual int GetSelection() const ; virtual int GetSelection() const ;
virtual void Delete(const int n); virtual void Delete(int n);
virtual char *GetClientData(const int n) const ; virtual char *GetClientData(int n) const ;
virtual void SetClientData(const int n, char *clientData); virtual void SetClientData(int n, char *clientData);
virtual void SetString(const int n, const wxString& s); virtual void SetString(int n, const wxString& s);
// For single or multiple choice list item // For single or multiple choice list item
virtual int GetSelections(wxArrayInt& aSelections) const; virtual int GetSelections(wxArrayInt& aSelections) const;
virtual bool Selected(const int n) const ; virtual bool Selected(int n) const ;
virtual wxString GetString(const int n) const ; virtual wxString GetString(int n) const ;
virtual void SetSize(const int x, const int y, const int width, const int height, const int sizeFlags = wxSIZE_AUTO); virtual void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
// Set the specified item at the first visible item // Set the specified item at the first visible item
// or scroll to max range. // or scroll to max range.
virtual void SetFirstItem(const int n) ; virtual void SetFirstItem(int n) ;
virtual void SetFirstItem(const wxString& s) ; virtual void SetFirstItem(const wxString& s) ;
virtual void InsertItems(const int nItems, const wxString items[], const int pos); virtual void InsertItems(int nItems, const wxString items[], int pos);
virtual wxString GetStringSelection(void) const ; virtual wxString GetStringSelection(void) const ;
virtual bool SetStringSelection(const wxString& s, const bool flag = TRUE); virtual bool SetStringSelection(const wxString& s, bool flag = TRUE);
virtual int Number(void) const ; virtual int Number(void) const ;
void Command(wxCommandEvent& event); void Command(wxCommandEvent& event);
@@ -116,7 +116,7 @@ class WXDLLEXPORT wxListBox: public wxControl
// Otherwise, all strings are used. // Otherwise, all strings are used.
virtual void SetHorizontalExtent(const wxString& s = wxEmptyString); virtual void SetHorizontalExtent(const wxString& s = wxEmptyString);
virtual WXHBRUSH OnCtlColor(const WXHDC pDC, const WXHWND pWnd, const WXUINT nCtlColor, virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
WXUINT message, WXWPARAM wParam, WXLPARAM lParam); WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);

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