which is generated by a wxChoice control.}
\twocolitem{{\bf EVT\_LISTBOX(id, func)}}{Process a wxEVT\_COMMAND\_LISTBOX\_SELECTED command,
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,
which is generated by a wxTextCtrl control.}
\twocolitem{{\bf EVT\_TEXT\_ENTER(id, func)}}{Process a wxEVT\_COMMAND\_TEXT\_ENTER command,
List box elements are numbered from zero.
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
-double clicks is to override \helpref{wxWindow::OnDefaultAction}{wxwindowondefaultaction}.
+wxEVT\_COMMAND\_LISTBOX\_DOUBLE\_CLICKED for double clicks.
\wxheading{Derived from}
\helpref{wxWindow::Destroy}{wxwindowdestroy},\rtfsp
\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}
\func{void}{OnDropFiles}{\param{wxDropFilesEvent\&}{ event}}
public:
wxDate ();
- wxDate (const long j);
- wxDate (const int m, const int d, const int y);
+ wxDate (long j);
+ wxDate (int m, int d, int y);
wxDate (const wxString& dat);
wxDate (const wxDate &dt);
void operator = (const wxDate& date);
void operator = (const wxString& date);
- wxDate operator + (const long i);
- wxDate operator + (const int i);
+ wxDate operator + (long i);
+ wxDate operator + (int i);
- wxDate operator - (const long i);
- wxDate operator - (const int i);
+ wxDate operator - (long i);
+ wxDate operator - (int i);
long operator - (const wxDate &dt);
- wxDate &operator += (const long i);
- wxDate &operator -= (const long i);
+ wxDate &operator += (long i);
+ wxDate &operator -= (long i);
wxDate &operator ++ (); // Prefix increment
wxDate &operator ++ (int); // Postfix increment
friend ostream &operator << (ostream &os, const wxDate &dt);
- wxString FormatDate (const int type=-1) const;
- void SetFormat (const int format);
- int SetOption (const int option, const bool enable=TRUE);
+ wxString FormatDate (int type=-1) const;
+ void SetFormat (int format);
+ int SetOption (int option, bool enable=TRUE);
long GetJulianDate() const; // returns julian date
int GetDayOfYear() const; // returns relative date since Jan. 1
bool IsBetween(const wxDate& first, const wxDate& second) const;
- wxDate Previous(const int dayOfWeek) const;
+ wxDate Previous(int dayOfWeek) const;
};
#endif
public:
wxDocChildFrame(wxDocument *doc, wxView *view, wxFrame *frame, const wxString& title,
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);
bool OnClose(void);
public:
wxDocParentFrame(wxDocManager *manager, wxFrame *frame, const wxString& title,
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);
// Extend event processing to search the document manager's event table
// Can instruct event processor that we wish to ignore this event
// (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; };
public:
// callback function
// Default behaviour
virtual long Default(void) { if (GetNextHandler()) return GetNextHandler()->Default(); else return 0; };
+
+/*
#if WXWIN_COMPATIBILITY
virtual void OldOnMenuCommand(int WXUNUSED(cmd));
virtual void OldOnMenuSelect(int WXUNUSED(cmd));
virtual void OldOnKillFocus(void);
virtual bool OldOnSysColourChange(void);
virtual void OldOnDropFiles(int n, char *files[], int x, int y);
-#endif
- virtual bool OnClose(void);
virtual void OnDefaultAction(wxControl *WXUNUSED(initiatingItem)) {};
virtual void OnChangeFocus(wxControl *WXUNUSED(from), wxControl *WXUNUSED(to)) {};
virtual bool OnFunctionKey(wxKeyEvent &WXUNUSED(event)) { return FALSE; };
+#endif
+*/
+
+ virtual bool OnClose(void);
inline char *GetClientData(void) const { return m_clientData; }
inline void SetClientData(char *clientData) { m_clientData = clientData; }
virtual bool ProcessEvent(wxEvent& event);
virtual bool SearchEventTable(wxEventTable& table, wxEvent& event);
- void Connect( const int id, const int lastId,
- const int eventType,
+ void Connect( int id, int lastId,
+ int eventType,
wxObjectEventFunction func,
wxObject *userData = 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_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_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 },
DECLARE_DYNAMIC_CLASS(wxRect)
public:
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& pos, const wxSize& size);
wxRect(const wxRect& rect);
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 void SetY(const long Y) { y = Y; }
+ inline void SetY(long Y) { y = Y; }
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 void SetHeight(const long h) { height = h; }
+ inline void SetHeight(long h) { height = h; }
inline wxPoint GetPosition(void) { return wxPoint(x, y); }
inline wxSize GetSize(void) { return wxSize(width, height); }
~wxPenList(void);
void AddPen(wxPen *pen);
void RemovePen(wxPen *pen);
- wxPen *FindOrCreatePen(const wxColour& colour, const int width, const int style);
- wxPen *FindOrCreatePen(const wxString& colour, const int width, const int style);
+ wxPen *FindOrCreatePen(const wxColour& colour, int width, int style);
+ wxPen *FindOrCreatePen(const wxString& colour, int width, int style);
};
class WXDLLEXPORT wxBrushList: public wxList
~wxBrushList(void);
void AddBrush(wxBrush *brush);
void RemoveBrush(wxBrush *brush);
- wxBrush *FindOrCreateBrush(const wxColour& colour, const int style);
- wxBrush *FindOrCreateBrush(const wxString& colour, const int style);
+ wxBrush *FindOrCreateBrush(const wxColour& colour, int style);
+ wxBrush *FindOrCreateBrush(const wxString& colour, int style);
};
WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
~wxFontList(void);
void AddFont(wxFont *font);
void RemoveFont(wxFont *font);
- wxFont *FindOrCreateFont(const int pointSize, const int family, const int style, const int weight,
- const bool underline = FALSE, const wxString& face = wxEmptyString);
+ wxFont *FindOrCreateFont(int pointSize, int family, int style, int weight,
+ bool underline = FALSE, const wxString& face = wxEmptyString);
};
class WXDLLEXPORT wxColourDatabase: public wxList
DECLARE_DYNAMIC_CLASS(wxSingleChoiceDialog)
public:
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,
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,
- 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,
const wxStringList& choices, char **clientData = NULL, long style = wxOK|wxCANCEL|wxCENTRE, const wxPoint& pos = wxDefaultPosition);
inline char *GetSelectionClientData(void) const { return m_clientData; }
void OnOK(wxCommandEvent& event);
+ void OnListBoxDClick(wxCommandEvent& event);
DECLARE_EVENT_TABLE()
};
wxString WXDLLEXPORT wxGetSingleChoice(const wxString& message, const wxString& caption,
- const int n, const wxString *choices, wxWindow *parent = NULL,
- const int x = -1, const int y = -1, const bool centre = TRUE,
- const int width = wxCHOICE_WIDTH, const int height = wxCHOICE_HEIGHT);
+ int n, const wxString *choices, wxWindow *parent = NULL,
+ int x = -1, int y = -1, bool centre = TRUE,
+ int width = wxCHOICE_WIDTH, int height = wxCHOICE_HEIGHT);
wxString WXDLLEXPORT wxGetSingleChoice(const wxString& message, const wxString& caption,
- const int n, char *choices[], wxWindow *parent = NULL,
- const int x = -1, const int y = -1, const bool centre = TRUE,
- const int width = wxCHOICE_WIDTH, const int height = wxCHOICE_HEIGHT);
+ int n, char *choices[], wxWindow *parent = NULL,
+ int x = -1, int y = -1, bool centre = TRUE,
+ int width = wxCHOICE_WIDTH, int height = wxCHOICE_HEIGHT);
// Same as above but gets position in list of strings, instead of string,
// or -1 if no selection
int WXDLLEXPORT wxGetSingleChoiceIndex(const wxString& message, const wxString& caption,
- const int n, const wxString *choices, wxWindow *parent = NULL,
- const int x = -1, const int y = -1, const bool centre = TRUE,
- const int width = wxCHOICE_WIDTH, const int height = wxCHOICE_HEIGHT);
+ int n, const wxString *choices, wxWindow *parent = NULL,
+ int x = -1, int y = -1, bool centre = TRUE,
+ int width = wxCHOICE_WIDTH, int height = wxCHOICE_HEIGHT);
int WXDLLEXPORT wxGetSingleChoiceIndex(const wxString& message, const wxString& caption,
- const int n, char *choices[], wxWindow *parent = NULL,
- const int x = -1, const int y = -1, const bool centre = TRUE,
- const int width = wxCHOICE_WIDTH, const int height = wxCHOICE_HEIGHT);
+ int n, char *choices[], wxWindow *parent = NULL,
+ int x = -1, int y = -1, bool centre = TRUE,
+ int width = wxCHOICE_WIDTH, int height = wxCHOICE_HEIGHT);
// Return client data instead
char* WXDLLEXPORT wxGetSingleChoiceData(const wxString& message, const wxString& caption,
- const int n, const wxString *choices, char **client_data,
- wxWindow *parent = NULL, const int x = -1, const int y = -1,
- const bool centre = TRUE,
- const int width = wxCHOICE_WIDTH, const int height = wxCHOICE_HEIGHT);
+ int n, const wxString *choices, char **client_data,
+ wxWindow *parent = NULL, int x = -1, int y = -1,
+ bool centre = TRUE,
+ int width = wxCHOICE_WIDTH, int height = wxCHOICE_HEIGHT);
char* WXDLLEXPORT wxGetSingleChoiceData(const wxString& message, const wxString& caption,
- const int n, char *choices[], char **client_data,
- wxWindow *parent = NULL, const int x = -1, const int y = -1,
- const bool centre = TRUE,
- const int width = wxCHOICE_WIDTH, const int height = wxCHOICE_HEIGHT);
-
+ int n, char *choices[], char **client_data,
+ wxWindow *parent = NULL, int x = -1, int y = -1,
+ bool centre = TRUE,
+ int width = wxCHOICE_WIDTH, int height = wxCHOICE_HEIGHT);
+
/*
int WXDLLEXPORT wxGetMultipleChoice(const wxString& message, const wxString& caption,
- const int n, const wxString *choices,
- const int nsel, int * selection,
- wxWindow *parent = NULL, const int x = -1 , const int y = -1, const bool centre = TRUE,
- const int width = wxCHOICE_WIDTH, const int height = wxCHOICE_HEIGHT);
+ int n, const wxString *choices,
+ int nsel, int * selection,
+ wxWindow *parent = NULL, int x = -1 , int y = -1, bool centre = TRUE,
+ int width = wxCHOICE_WIDTH, int height = wxCHOICE_HEIGHT);
*/
#endif
public:
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);
}
bool RemoveAll();
bool GetSize( int index, int &width, int &height ) const;
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:
wxList m_images;
//-----------------------------------------------------------------------------
// 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
wxListItemData( const wxListItem &info );
void SetItem( const wxListItem &info );
void SetText( const wxString &s );
- void SetImage( const int image );
- void SetData( const long data );
- void SetPosition( const int x, const int y );
- void SetSize( const int width, const int height );
+ void SetImage( int image );
+ void SetData( long data );
+ void SetPosition( int x, int y );
+ void SetSize( int width, int height );
void SetColour( wxColour *col );
bool HasImage(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 );
int GetX( void ) const;
int GetY( void ) const;
wxListHeaderData(void);
wxListHeaderData( const wxListItem &info );
void SetItem( const wxListItem &item );
- void SetPosition( const int x, const int y );
- void SetWidth( const int w );
- void SetFormat( const int format );
- void SetHeight( const int h );
+ void SetPosition( int x, int y );
+ void SetWidth( int w );
+ void SetFormat( int format );
+ void SetHeight( int h );
bool HasImage(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 GetText( wxString &s );
int GetImage(void) const;
int m_spacing;
wxListMainWindow *m_owner;
- void DoDraw( wxPaintDC *dc, const bool hilight, const bool paintBG );
+ void DoDraw( wxPaintDC *dc, bool hilight, bool paintBG );
public:
wxListLineData( void ) {};
- wxListLineData( wxListMainWindow *owner, const int mode, wxBrush *hilightBrush );
- void CalculateSize( wxPaintDC *dc, const int spacing );
- void SetPosition( wxPaintDC *dc, const int x, const int y, const int window_width );
- void SetColumnPosition( const int index, const int x );
+ wxListLineData( wxListMainWindow *owner, int mode, wxBrush *hilightBrush );
+ void CalculateSize( wxPaintDC *dc, int spacing );
+ void SetPosition( wxPaintDC *dc, int x, int y, int window_width );
+ void SetColumnPosition( int index, int x );
void GetSize( int &width, int &height );
void GetExtent( 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 );
- void InitItems( const int num );
- void SetItem( const int index, const wxListItem &info );
- void GetItem( const int index, wxListItem &info );
- void GetText( const int index, wxString &s );
- void SetText( const int index, const wxString s );
- int GetImage( const int index );
+ long IsHit( int x, int y );
+ void InitItems( int num );
+ void SetItem( int index, const wxListItem &info );
+ void GetItem( int index, wxListItem &info );
+ void GetText( int index, wxString &s );
+ void SetText( int index, const wxString s );
+ int GetImage( int index );
void GetRect( wxRectangle &rect );
- void Hilight( const bool on );
+ void Hilight( bool on );
void ReverseHilight( void );
- void DrawRubberBand( wxPaintDC *dc, const bool on );
+ void DrawRubberBand( wxPaintDC *dc, bool on );
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 );
- 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 );
};
public:
wxListHeaderWindow( void );
- wxListHeaderWindow( wxWindow *win, const wxWindowID id, wxListMainWindow *owner,
- const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
- const long style = 0, const wxString &name = "columntitles" );
+ wxListHeaderWindow( wxWindow *win, wxWindowID id, wxListMainWindow *owner,
+ const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
+ long style = 0, const wxString &name = "columntitles" );
void DoDrawRect( wxPaintDC *dc, int x, int y, int w, int h );
void OnPaint( wxPaintEvent &event );
void OnMouse( wxMouseEvent &event );
public:
wxListMainWindow(void);
- wxListMainWindow( wxWindow *parent, const wxWindowID id,
- const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
- const long style = 0, const wxString &name = "listctrl" );
+ wxListMainWindow( wxWindow *parent, wxWindowID id,
+ const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
+ long style = 0, const wxString &name = "listctrl" );
~wxListMainWindow(void);
void RefreshLine( wxListLineData *line );
void OnPaint( wxPaintEvent &event );
- void HilightAll( const bool on );
+ void HilightAll( bool on );
void ActivateLine( wxListLineData *line );
void SendNotify( wxListLineData *line, wxEventType command );
void FocusLine( wxListLineData *line );
int GetIndexOfLine( const wxListLineData *line );
int GetTextLength( wxString &s ); // should be const
- void SetImageList( wxImageList *imageList, const int which );
- void SetItemSpacing( const int spacing, const bool isSmall = FALSE );
- int GetItemSpacing( const bool isSmall = FALSE );
- void SetColumn( const int col, wxListItem &item );
- void SetColumnWidth( const int col, const int width );
- void GetColumn( const int col, wxListItem &item );
- int GetColumnWidth( const int vol );
+ void SetImageList( wxImageList *imageList, int which );
+ void SetItemSpacing( int spacing, bool isSmall = FALSE );
+ int GetItemSpacing( bool isSmall = FALSE );
+ void SetColumn( int col, wxListItem &item );
+ void SetColumnWidth( int col, int width );
+ void GetColumn( int col, wxListItem &item );
+ int GetColumnWidth( int vol );
int GetColumnCount( void );
int GetCountPerPage( void );
void SetItem( wxListItem &item );
void GetItem( wxListItem &item );
- void SetItemState( const long item, const long state, const long stateMask );
- int GetItemState( const long item, const long stateMask );
+ void SetItemState( long item, long state, long stateMask );
+ int GetItemState( long item, long stateMask );
int GetItemCount( void );
- void GetItemRect( const long index, wxRectangle &rect );
+ void GetItemRect( long index, wxRectangle &rect );
int GetSelectedItemCount( void );
- void SetMode( const long mode );
+ void SetMode( long mode );
long GetMode( void ) const;
void CalculatePositions( void );
void RealizeChanges(void);
- long GetNextItem( const long item, int geometry, int state );
- void DeleteItem( const long index );
+ long GetNextItem( long item, int geometry, int state );
+ void DeleteItem( long index );
void DeleteAllItems( void );
- void DeleteColumn( const int col );
+ void DeleteColumn( int col );
void DeleteEverything( void );
- void EnsureVisible( const long index );
- long FindItem(const long start, const wxString& str, const bool partial = FALSE );
- long FindItem(const long start, const long data);
- long HitTest( const int x, const int y, int &flags );
+ void EnsureVisible( long index );
+ long FindItem(long start, const wxString& str, bool partial = FALSE );
+ long FindItem(long start, long data);
+ long HitTest( int x, int y, int &flags );
void InsertItem( wxListItem &item );
- void InsertColumn( const long col, wxListItem &item );
+ void InsertColumn( long col, wxListItem &item );
void SortItems( wxListCtrlCompare fn, long data );
virtual bool OnListNotify( wxListEvent &event );
public:
wxListCtrl(void);
- wxListCtrl( wxWindow *parent, const wxWindowID id,
- const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
- const long style = 0, const wxString &name = "listctrl" );
+ wxListCtrl( wxWindow *parent, wxWindowID id,
+ const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
+ long style = 0, const wxString &name = "listctrl" );
~wxListCtrl(void);
- bool Create( wxWindow *parent, const wxWindowID id,
- const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
- const long style = 0, const wxString &name = "listctrl" );
+ bool Create( wxWindow *parent, wxWindowID id,
+ const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
+ long style = 0, const wxString &name = "listctrl" );
void OnSize( wxSizeEvent &event );
void SetBackgroundColour( const wxColour& col );
- bool GetColumn( const int col, wxListItem& item );
- bool SetColumn( const int col, wxListItem& item );
- int GetColumnWidth( const int col );
- bool SetColumnWidth( const int col, const int width);
+ bool GetColumn( int col, wxListItem& item );
+ bool SetColumn( int col, wxListItem& item );
+ int GetColumnWidth( int col );
+ bool SetColumnWidth( int col, int width);
int GetCountPerPage(void); // not the same in wxGLC as in Windows, I think
// wxText& GetEditControl(void) const; // not supported in wxGLC
bool GetItem( wxListItem& info );
bool SetItem( wxListItem& info ) ;
- long SetItem( const long index, const int col, const wxString& label, const int imageId = -1 );
- int GetItemState( const long item, const long stateMask );
- bool SetItemState( const long item, const long state, const long stateMask);
- bool SetItemImage( const long item, const int image, const int selImage);
- wxString GetItemText( const long item );
- void SetItemText( const long item, const wxString& str );
- long GetItemData( const long item );
- bool SetItemData( const long item, long data );
- bool GetItemRect( const long item, wxRectangle& rect, const int code = wxLIST_RECT_BOUNDS ); // not supported in wxGLC
- bool GetItemPosition( const long item, wxPoint& pos ) const; // not supported in wxGLC
- bool SetItemPosition( const long item, const wxPoint& pos ); // not supported in wxGLC
+ long SetItem( long index, int col, const wxString& label, int imageId = -1 );
+ int GetItemState( long item, long stateMask );
+ bool SetItemState( long item, long state, long stateMask);
+ bool SetItemImage( long item, int image, int selImage);
+ wxString GetItemText( long item );
+ void SetItemText( long item, const wxString& str );
+ long GetItemData( long item );
+ bool SetItemData( long item, long data );
+ bool GetItemRect( long item, wxRectangle& rect, int code = wxLIST_RECT_BOUNDS ); // not supported in wxGLC
+ bool GetItemPosition( long item, wxPoint& pos ) const; // not supported in wxGLC
+ bool SetItemPosition( long item, const wxPoint& pos ); // not supported in wxGLC
int GetItemCount(void);
int GetItemSpacing( bool isSmall );
int GetSelectedItemCount(void);
// wxColour GetTextColour(void) const; // wxGLC has colours for every Item (see wxListItem)
// void SetTextColour(const wxColour& col);
long GetTopItem(void);
- void SetSingleStyle( const long style, const bool add = TRUE ) ;
- void SetWindowStyleFlag(const long style);
+ void SetSingleStyle( long style, bool add = TRUE ) ;
+ void SetWindowStyleFlag(long style);
void RecreateWindow(void) {};
- long GetNextItem(const long item, int geometry = wxLIST_NEXT_ALL, int state = wxLIST_STATE_DONTCARE);
- wxImageList *GetImageList(const int which);
- void SetImageList(wxImageList *imageList, const int which) ;
- bool Arrange( const int flag = wxLIST_ALIGN_DEFAULT ); // always wxLIST_ALIGN_LEFT in wxGLC
- bool DeleteItem( const long item );
+ long GetNextItem(long item, int geometry = wxLIST_NEXT_ALL, int state = wxLIST_STATE_DONTCARE);
+ wxImageList *GetImageList(int which);
+ void SetImageList(wxImageList *imageList, int which) ;
+ bool Arrange( int flag = wxLIST_ALIGN_DEFAULT ); // always wxLIST_ALIGN_LEFT in wxGLC
+ bool DeleteItem( long item );
bool DeleteAllItems(void) ;
- bool DeleteColumn( const int col );
-// wxText& Edit(const long item) ; // not supported in wxGLC
- bool EnsureVisible( const long item );
- long FindItem(const long start, const wxString& str, const bool partial = FALSE );
- long FindItem(const long start, const long data);
- long FindItem(const long start, const wxPoint& pt, const int direction); // not supported in wxGLC
+ bool DeleteColumn( int col );
+// wxText& Edit(long item) ; // not supported in wxGLC
+ bool EnsureVisible( long item );
+ long FindItem(long start, const wxString& str, bool partial = FALSE );
+ long FindItem(long start, long data);
+ long FindItem(long start, const wxPoint& pt, int direction); // not supported in wxGLC
long HitTest(const wxPoint& point, int& flags);
long InsertItem(wxListItem& info);
- long InsertItem(const long index, const wxString& label);
- long InsertItem(const long index, const int imageIndex);
- long InsertItem(const long index, const wxString& label, const int imageIndex);
- long InsertColumn(const long col, wxListItem& info);
- long InsertColumn(const long col, const wxString& heading, const int format = wxLIST_FORMAT_LEFT,
- const int width = -1);
- bool ScrollList(const int dx, const int dy);
+ long InsertItem(long index, const wxString& label);
+ long InsertItem(long index, int imageIndex);
+ long InsertItem(long index, const wxString& label, int imageIndex);
+ long InsertColumn(long col, wxListItem& info);
+ long InsertColumn(long col, const wxString& heading, int format = wxLIST_FORMAT_LEFT,
+ int width = -1);
+ bool ScrollList(int dx, int dy);
bool SortItems(wxListCtrlCompare fn, long data);
- bool Update(const long item);
+ bool Update(long item);
virtual bool OnListNotify(wxListEvent& WXUNUSED(event)) { return FALSE; }
void SetDropTarget( wxDropTarget *dropTarget )
{ m_mainWin->SetDropTarget( dropTarget ); };
#define wxMessageDialog wxGenericMessageDialog
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
// Old-style constructor
inline wxPanel(wxWindow *parent,
- const int x = -1, const int y= -1, const int width = 500, const int height = 500,
- const long style = wxTAB_TRAVERSAL | wxNO_BORDER,
+ int x = -1, int y= -1, int width = 500, int height = 500,
+ long style = wxTAB_TRAVERSAL | wxNO_BORDER,
const wxString& name = wxPanelNameStr)
{
Create(parent, -1, wxPoint(x, y), wxSize(width, height), style, name);
}
// Constructor
- inline wxPanel(wxWindow *parent, const wxWindowID id,
+ inline wxPanel(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
- const long style = wxTAB_TRAVERSAL | wxNO_BORDER,
+ long style = wxTAB_TRAVERSAL | wxNO_BORDER,
const wxString& name = wxPanelNameStr)
{
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 wxSize& size = wxDefaultSize,
- const long style = wxTAB_TRAVERSAL | wxNO_BORDER,
+ long style = wxTAB_TRAVERSAL | wxNO_BORDER,
const wxString& name = wxPanelNameStr);
void OnPaint(wxPaintEvent& event);
public:
wxScrolledWindow(void);
- inline wxScrolledWindow(wxWindow *parent, const wxWindowID id = -1,
+ inline wxScrolledWindow(wxWindow *parent, wxWindowID id = -1,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
- const long style = wxHSCROLL|wxVSCROLL,
+ long style = wxHSCROLL|wxVSCROLL,
const wxString& name = wxPanelNameStr)
{
Create(parent, id, pos, size, style, name);
inline ~wxScrolledWindow(void) {}
- bool Create(wxWindow *parent, const wxWindowID id,
+ bool Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
- const long style = wxHSCROLL|wxVSCROLL,
+ long style = wxHSCROLL|wxVSCROLL,
const wxString& name = wxPanelNameStr);
// Set client size
// 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?
// inline bool IsRetained(void) const;
// Number of pixels per user unit (0 or -1 for no scrollbar)
// Length of virtual canvas in user units
// Length of page in user units
- virtual void SetScrollbars(const int pixelsPerUnitX, const int pixelsPerUnitY,
- const int noUnitsX, const int noUnitsY,
- const int xPos = 0, const int yPos = 0,
- const bool noRefresh = FALSE );
+ virtual void SetScrollbars(int pixelsPerUnitX, int pixelsPerUnitY,
+ int noUnitsX, int noUnitsY,
+ int xPos = 0, int yPos = 0,
+ bool noRefresh = FALSE );
// 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
virtual void GetScrollUnitsPerPage(int *x_page, int *y_page) const;
// If FALSE, the whole canvas is invalidated and a Clear() is
// necessary. Disable for when the scroll increment is used
// 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
virtual void ViewStart(int *x, int *y) const;
// Actual size in pixels when scrolling is taken into account
virtual void GetVirtualSize(int *x, int *y) const;
- virtual void CalcScrolledPosition(const int x, const int y, int *xx, int *yy) const ;
- virtual void CalcUnscrolledPosition(const int x, const int y, float *xx, float *yy) const ;
+ virtual void CalcScrolledPosition(int x, int y, int *xx, int *yy) const ;
+ virtual void CalcUnscrolledPosition(int x, int y, float *xx, float *yy) const ;
// Adjust the scrollbars
virtual void AdjustScrollbars(void);
wxSplitterWindow(void);
// Normal constructor
- wxSplitterWindow(wxWindow *parent, const wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition,
- const wxSize& size = wxDefaultSize, const long style = wxSP_3D|wxCLIP_CHILDREN, const wxString& name = "splitter");
+ wxSplitterWindow(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition,
+ const wxSize& size = wxDefaultSize, long style = wxSP_3D|wxCLIP_CHILDREN, const wxString& name = "splitter");
~wxSplitterWindow(void);
// Gets the only or left/top pane
inline wxWindow *GetWindow2(void) { return m_windowTwo; }
// 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
inline int GetSplitMode(void) const { return m_splitMode; };
// and changing the split mode.
// Does nothing and returns FALSE if the window is already split.
// A sashPosition of -1 means choose a default sash position.
- bool SplitVertically(wxWindow *window1, wxWindow *window2, const int sashPosition = -1);
- bool SplitHorizontally(wxWindow *window1, wxWindow *window2, const int sashPosition = -1);
+ bool SplitVertically(wxWindow *window1, wxWindow *window2, int sashPosition = -1);
+ bool SplitHorizontally(wxWindow *window1, wxWindow *window2, int sashPosition = -1);
// Removes the specified (or second) window from the view
// Doesn't actually delete the window.
inline bool IsSplit(void) const { return (m_windowTwo != NULL); }
// 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
- inline void SetBorderSize(const int width) { m_borderSize = width; }
+ inline void SetBorderSize(int width) { m_borderSize = width; }
// Gets the sash size
inline int GetSashSize(void) const { return m_sashSize; }
inline int GetBorderSize(void) const { return m_borderSize; }
// Set the sash position
- void SetSashPosition(const int position, const bool redaw = TRUE);
+ void SetSashPosition(int position, bool redaw = TRUE);
// Gets the sash position
inline int GetSashPosition(void) const { return m_sashPosition; }
// 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; }
// If the sash is moved to an extreme position, a subwindow
void DrawSash(wxDC& dc);
// 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
- bool SashHitTest(const int x, const int y, const int tolerance = 2);
+ bool SashHitTest(int x, int y, int tolerance = 2);
// Resizes subwindows
void SizeWindows(void);
public:
wxStatusBar(void);
- inline wxStatusBar(wxWindow *parent, const wxWindowID id,
+ inline wxStatusBar(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
- const long style = 0,
+ long style = 0,
const wxString& name = wxPanelNameStr)
{
Create(parent, id, pos, size, style, name);
~wxStatusBar(void);
- bool Create(wxWindow *parent, const wxWindowID id,
+ bool Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
- const long style = 0,
+ long style = 0,
const wxString& name = wxPanelNameStr);
// 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; }
// Set status line text
- virtual void SetStatusText(const wxString& text, const int number = 0);
- virtual wxString GetStatusText(const int number = 0) const;
+ virtual void SetStatusText(const wxString& text, int number = 0);
+ virtual wxString GetStatusText(int number = 0) const;
// 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 DrawField(wxDC& dc, const int i);
+ virtual void DrawFieldText(wxDC& dc, int i);
+ virtual void DrawField(wxDC& dc, int i);
// 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 GetBorderY(void) const { return m_borderY; }
- inline void SetBorderX(const int x);
- inline void SetBorderY(const int y);
+ inline void SetBorderX(int x);
+ inline void SetBorderY(int y);
////////////////////////////////////////////////////////////////////////
// Implementation
public:
- wxTabbedDialog(wxWindow *parent, const wxWindowID id, const wxString& title,
+ wxTabbedDialog(wxWindow *parent, wxWindowID id, const wxString& title,
const wxPoint& pos = wxDefaultPosition,
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);
inline wxTabView *GetTabView() const { return m_tabView; }
public:
- wxTabbedPanel(wxWindow *parent, const wxWindowID id,
+ wxTabbedPanel(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
- const long windowStyle = 0, const wxString& name = wxPanelNameStr);
+ long windowStyle = 0, const wxString& name = wxPanelNameStr);
~wxTabbedPanel(void);
inline wxTabView *GetTabView() const { return m_tabView; }
public:
wxTreeCtrl(void);
- wxTreeCtrl(wxWindow *parent, const wxWindowID id = -1,
+ wxTreeCtrl(wxWindow *parent, wxWindowID id = -1,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxTR_HAS_BUTTONS,
const wxString& name = "wxTreeCtrl" );
~wxTreeCtrl(void);
- bool Create(wxWindow *parent, const wxWindowID id = -1,
+ bool Create(wxWindow *parent, wxWindowID id = -1,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxTR_HAS_BUTTONS,
const wxString& name = "wxTreeCtrl");
int GetCount(void) const;
- long InsertItem( long parent, const wxString& label, const int image = -1,
- const int selImage = -1, long insertAfter = wxTREE_INSERT_LAST );
+ long InsertItem( long parent, const wxString& label, int image = -1,
+ int selImage = -1, long insertAfter = wxTREE_INSERT_LAST );
long InsertItem( long parent, wxTreeItem &info, long insertAfter = wxTREE_INSERT_LAST );
bool DeleteAllItems(void);
- bool ExpandItem( long item, const int action );
+ bool ExpandItem( long item, int action );
bool GetItem( wxTreeItem &info ) const;
long GetItemData( long item ) const;
wxString GetItemText( long item ) const;
long GetSelection(void) const;
bool SelectItem( long item ) const;
bool ItemHasChildren( long item ) const;
- void SetIndent( const int indent );
+ void SetIndent( int indent );
int GetIndent(void) const;
bool SetItem( wxTreeItem &info );
bool SetItemData( long item, long data );
wxMask(void);
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(void);
public:
wxBitmap(void);
- wxBitmap( const int width, const int height, const int depth = -1 );
- wxBitmap( const char bits[], const int width, const int height, const int depth = 1 );
+ wxBitmap( int width, int height, int depth = -1 );
+ wxBitmap( const char bits[], int width, int height, int depth = 1 );
wxBitmap( char **bits );
wxBitmap( const wxBitmap& bmp );
wxBitmap( const wxBitmap* bmp );
- wxBitmap( const wxString &filename, const int type );
+ wxBitmap( const wxString &filename, int type );
~wxBitmap(void);
wxBitmap& operator = ( const wxBitmap& bmp );
bool operator == ( const wxBitmap& bmp );
int GetHeight(void) const;
int GetWidth(void) const;
int GetDepth(void) const;
- void SetHeight( const int height );
- void SetWidth( const int width );
- void SetDepth( const int depth );
+ void SetHeight( int height );
+ void SetWidth( int width );
+ void SetDepth( int depth );
wxMask *GetMask(void) const;
void SetMask( wxMask *mask );
- bool SaveFile( const wxString &name, const int type, wxPalette *palette = NULL );
- bool LoadFile( const wxString &name, const int type );
-
+ bool SaveFile( const wxString &name, int type, wxPalette *palette = NULL );
+ bool LoadFile( const wxString &name, int type );
+
wxPalette *GetPalette(void) const;
wxPalette *GetColourMap(void) const
{ return GetPalette(); };
wxBitmapButton(void);
wxBitmapButton( wxWindow *parent, wxWindowID id, const wxBitmap &bitmap,
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,
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 SetLabel( const wxString &label );
wxString GetLabel(void) const;
public:
wxBrush(void);
- wxBrush( const wxColour &colour, const int style );
- wxBrush( const wxString &colourName, const int style );
+ wxBrush( const wxColour &colour, int style );
+ wxBrush( const wxString &colourName, int style );
wxBrush( const wxBitmap &stippleBitmap );
wxBrush( const wxBrush &brush );
wxBrush( const wxBrush *brush );
wxButton(void);
wxButton( wxWindow *parent, wxWindowID id, const wxString &label,
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,
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 SetLabel( const wxString &label );
wxString GetLabel(void) const;
wxCheckBox(void);
wxCheckBox( wxWindow *parent, wxWindowID id, const wxString &label,
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,
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
- const long style = 0, const wxString &name = wxCheckBoxNameStr );
- void SetValue( const bool state );
+ long style = 0, const wxString &name = wxCheckBoxNameStr );
+ void SetValue( bool state );
bool GetValue(void) const;
};
public:
wxChoice(void);
- wxChoice( wxWindow *parent, const wxWindowID id,
- const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
- const int n = 0, const wxString choices[] = NULL,
- const long style = 0, const wxString &name = wxChoiceNameStr );
- bool Create( wxWindow *parent, const wxWindowID id,
- const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
- const int n = 0, const wxString choices[] = NULL,
- const long style = 0, const wxString &name = wxChoiceNameStr );
+ wxChoice( wxWindow *parent, wxWindowID id,
+ const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
+ int n = 0, const wxString choices[] = NULL,
+ long style = 0, const wxString &name = wxChoiceNameStr );
+ bool Create( wxWindow *parent, wxWindowID id,
+ const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
+ int n = 0, const wxString choices[] = NULL,
+ long style = 0, const wxString &name = wxChoiceNameStr );
void Append( const wxString &item );
void Clear(void);
int FindString( const wxString &string ) const;
int GetColumns(void) const;
int GetSelection(void);
- wxString GetString( const int n ) const;
+ wxString GetString( int n ) const;
wxString GetStringSelection(void) const;
int Number(void) const;
- void SetColumns( const int n = 1 );
- void SetSelection( const int n );
+ void SetColumns( int n = 1 );
+ void SetSelection( int n );
void SetStringSelection( const wxString &string );
};
public:
inline wxComboBox(void) {}
- inline wxComboBox(wxWindow *parent, const wxWindowID id,
+ inline wxComboBox(wxWindow *parent, wxWindowID id,
const wxString& value = wxEmptyString,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
- const int n = 0, const wxString choices[] = NULL,
- const long style = 0,
+ int n = 0, const wxString choices[] = NULL,
+ long style = 0,
const wxString& name = wxComboBoxNameStr)
{
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 wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
- const int n = 0, const wxString choices[] = NULL,
- const long style = 0,
+ int n = 0, const wxString choices[] = NULL,
+ long style = 0,
const wxString& name = wxComboBoxNameStr);
// List functions
void Clear(void);
void Append( const wxString &item );
void Append( const wxString &item, char* clientData );
- void Delete( const int n );
+ void Delete( int n );
int FindString( const wxString &item );
- char* GetClientData( const int n );
- void SetClientData( const int n, char * clientData );
+ char* GetClientData( int n );
+ void SetClientData( int n, char * clientData );
int GetSelection(void) const;
- wxString GetString( const int n ) const;
+ wxString GetString( int n ) const;
wxString GetStringSelection(void) const;
int Number(void) const;
- void SetSelection( const int n );
-
+ void SetSelection( int n );
+
// Text field functions
wxString GetValue(void) const ;
void SetValue(const wxString& value);
void Copy(void);
void Cut(void);
void Paste(void);
- void SetInsertionPoint(const long pos);
+ void SetInsertionPoint(long pos);
void SetInsertionPointEnd(void);
long GetInsertionPoint(void) const ;
long GetLastPosition(void) const ;
- void Replace(const long from, const long to, const wxString& value);
- void Remove(const long from, const long to);
- void SetSelection(const long from, const long to);
- void SetEditable(const bool editable);
-
+ void Replace(long from, long to, const wxString& value);
+ void Remove(long from, long to);
+ void SetSelection(long from, long to);
+ void SetEditable(bool editable);
+
private:
wxList m_clientData;
wxControl(void);
wxControl( wxWindow *parent, wxWindowID id,
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 SetLabel( const wxString &label );
virtual wxString GetLabel(void) const;
public:
wxCursor(void);
- wxCursor( const int cursorId );
+ wxCursor( int cursorId );
wxCursor( const wxCursor &cursor );
wxCursor( const wxCursor *cursor );
~wxCursor(void);
wxDialog(void);
wxDialog( wxWindow *parent, wxWindowID id, const wxString &title,
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,
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);
void SetTitle(const wxString& title);
wxString GetTitle(void) const;
/*
void OnCharHook(wxKeyEvent& event);
*/
- virtual bool Show( const bool show );
+ virtual bool Show( bool show );
virtual int ShowModal(void);
virtual void EndModal(int retCode);
virtual bool IsModal(void) const { return ((GetWindowStyleFlag() & wxDIALOG_MODAL) == wxDIALOG_MODAL); }
wxDragSource( wxWindow *win );
~wxDragSource(void);
- void SetData( char *data, const long size );
+ void SetData( char *data, long size );
void Start( int x, int y );
public:
public:
wxFrame(void);
- wxFrame( wxWindow *parent, const wxWindowID id, const wxString &title,
- const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
- const long style = wxDEFAULT_FRAME_STYLE, const wxString &name = wxFrameNameStr );
- bool Create( wxWindow *parent, const wxWindowID id, const wxString &title,
- const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
- const long style = wxDEFAULT_FRAME_STYLE, const wxString &name = wxFrameNameStr );
+ wxFrame( wxWindow *parent, wxWindowID id, const wxString &title,
+ const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
+ long style = wxDEFAULT_FRAME_STYLE, const wxString &name = wxFrameNameStr );
+ bool Create( wxWindow *parent, wxWindowID id, const wxString &title,
+ const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
+ long style = wxDEFAULT_FRAME_STYLE, const wxString &name = wxFrameNameStr );
~wxFrame(void);
bool Destroy(void);
void OnCloseWindow( wxCloseEvent& event );
- virtual bool Show( const bool show );
- virtual void Enable( const bool enable );
+ virtual bool Show( bool show );
+ virtual void Enable( bool enable );
virtual void GetClientSize( int *width, int *height ) const;
void OnSize( wxSizeEvent &event );
void SetMenuBar( wxMenuBar *menuBar );
- virtual bool CreateStatusBar( const int number = 1 );
- virtual void SetStatusText( const wxString &text, const int number = 0 );
- virtual void SetStatusWidths( const int n, const int *width );
+ virtual bool CreateStatusBar( int number = 1 );
+ virtual void SetStatusText( const wxString &text, int number = 0 );
+ virtual void SetStatusWidths( int n, int *width );
wxStatusBar *GetStatusBar(void);
wxMenuBar *GetMenuBar(void);
void SetTitle( const wxString &title );
public:
inline wxGauge(void) { m_rangeMax = 0; m_gaugePos = 0; m_useProgressBar = TRUE; }
- inline wxGauge(wxWindow *parent, const wxWindowID id,
- const int range,
+ inline wxGauge(wxWindow *parent, wxWindowID id,
+ int range,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
- const long style = wxGA_HORIZONTAL,
+ long style = wxGA_HORIZONTAL,
const wxString& name = wxGaugeNameStr)
{
Create(parent, id, range, pos, size, style, name);
};
- bool Create(wxWindow *parent, const wxWindowID id,
- const int range,
+ bool Create(wxWindow *parent, wxWindowID id,
+ int range,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
- const long style = wxGA_HORIZONTAL,
+ long style = wxGA_HORIZONTAL,
const wxString& name = wxGaugeNameStr );
- void SetShadowWidth( const int WXUNUSED(w) ) {};
- void SetBezelFace( const int WXUNUSED(w) ) {};
- void SetRange( const int r );
- void SetValue( const int pos );
+ void SetShadowWidth( int WXUNUSED(w) ) {};
+ void SetBezelFace( int WXUNUSED(w) ) {};
+ void SetRange( int r );
+ void SetValue( int pos );
int GetShadowWidth(void) const { return 0; };
int GetBezelFace(void) const { return 0; };
int GetRange(void) const;
inline wxIcon(const wxIcon& 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 ) {};
inline wxIcon& operator = (const wxIcon& icon) { if (*this == icon) return (*this); Ref(icon); return *this; }
wxListBox(void);
wxListBox( wxWindow *parent, wxWindowID id,
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
- const int n = 0, const wxString choices[] = NULL,
- const long style = 0, const wxString &name = wxListBoxNameStr );
- bool Create( wxWindow *parent, wxWindowID id,
+ int n = 0, const wxString choices[] = NULL,
+ long style = 0, const wxString &name = wxListBoxNameStr );
+ bool Create( wxWindow *parent, wxWindowID id,
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
- const int n = 0, const wxString choices[] = NULL,
- const long style = 0, const wxString &name = wxListBoxNameStr );
+ int n = 0, const wxString choices[] = NULL,
+ long style = 0, const wxString &name = wxListBoxNameStr );
void Append( const wxString &item );
void Append( const wxString &item, char *clientData );
void Clear(void);
void Delete( int n );
void Deselect( int n );
int FindString( const wxString &item ) const;
- char *GetClientData( const int n ) const;
+ char *GetClientData( int n ) const;
int GetSelection(void) const;
int GetSelections( class wxArrayInt &) const;
wxString GetString( int n ) const;
wxString GetStringSelection(void) const;
int Number(void);
- bool Selected( const int n );
- void Set( const int n, const wxString *choices );
- void SetClientData( const int n, char *clientData );
+ bool Selected( int n );
+ void Set( int n, const wxString *choices );
+ void SetClientData( int n, char *clientData );
void SetFirstItem( int n );
void SetFirstItem( const wxString &item );
- void SetSelection( const int n, const bool select = TRUE );
- void SetString( const int n, const wxString &string );
- void SetStringSelection( const wxString &string, const bool select = TRUE );
-
+ void SetSelection( int n, bool select = TRUE );
+ void SetString( int n, const wxString &string );
+ void SetStringSelection( const wxString &string, bool select = TRUE );
+
private:
GtkList *m_list;
wxMDIParentFrame(void);
wxMDIParentFrame( wxWindow *parent,
- const wxWindowID id, const wxString& title,
+ wxWindowID id, const wxString& title,
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 );
~wxMDIParentFrame(void);
bool Create( wxWindow *parent,
- const wxWindowID id, const wxString& title,
+ wxWindowID id, const wxString& title,
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 );
void OnSize( wxSizeEvent& event );
wxMDIChildFrame(void);
wxMDIChildFrame( wxMDIParentFrame *parent,
- const wxWindowID id, const wxString& title,
+ wxWindowID id, const wxString& title,
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);
bool Create( wxMDIParentFrame *parent,
- const wxWindowID id, const wxString& title,
+ wxWindowID id, const wxString& title,
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 );
// no status bars in wxGTK
- virtual bool CreateStatusBar( const int WXUNUSED(number) = 1 ) { return FALSE; };
- virtual void SetStatusText( const wxString &WXUNUSED(text), const int WXUNUSED(number) ) {};
- virtual void SetStatusWidths( const int WXUNUSED(n), const int *WXUNUSED(width) ) {};
-
+ virtual bool CreateStatusBar( int WXUNUSED(number) = 1 ) { return FALSE; };
+ virtual void SetStatusText( const wxString &WXUNUSED(text), int WXUNUSED(number) ) {};
+ virtual void SetStatusWidths( int WXUNUSED(n), int *WXUNUSED(width) ) {};
+
virtual void Maximize(void) {};
virtual void Restore(void) {};
virtual void Activate(void);
public:
wxMDIClientWindow(void);
- wxMDIClientWindow( wxMDIParentFrame *parent, const long style = 0 );
+ wxMDIClientWindow( wxMDIParentFrame *parent, long style = 0 );
~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 );
};
wxMenu( const wxString &title = "" );
void AppendSeparator(void);
- void Append( const int id, const wxString &item,
- const wxString &helpStr = "", const bool checkable = FALSE );
- void Append( const int id, const wxString &item,
+ void Append( int id, const wxString &item,
+ const wxString &helpStr = "", bool checkable = FALSE );
+ void Append( int id, const wxString &item,
wxMenu *subMenu, const wxString &helpStr = "" );
int FindItem( const wxString itemString ) const;
void Break(void) {};
- void Enable( const int id, const bool enable );
- bool Enabled( const int id ) const;
- void SetLabel( const int id, const wxString &label );
-
+ void Enable( int id, bool enable );
+ bool Enabled( int id ) const;
+ void SetLabel( int id, const wxString &label );
+
public:
int FindMenuIdByMenuItem( GtkWidget *menuItem ) const;
wxNotebook();
// the same arguments as for wxControl (@@@ any special styles?)
wxNotebook(wxWindow *parent,
- const wxWindowID id,
+ wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
- const long style = 0,
+ long style = 0,
const wxString& name = "notebook");
// Create() function
bool Create(wxWindow *parent,
- const wxWindowID id,
+ wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
- const long style = 0,
+ long style = 0,
const wxString& name = "notebook");
// dtor
~wxNotebook();
public:
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(void);
bool operator != ( const wxPalette& palette );
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;
- 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
};
void SetColour( const wxColour &colour );
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 SetJoin( int joinStyle );
void SetStyle( int style );
public:
wxRadioBox(void);
- wxRadioBox( wxWindow *parent, const wxWindowID id, const wxString& title,
- const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
- const int n = 0, const wxString choices[] = NULL,
- const int majorDim = 0, const long style = wxRA_HORIZONTAL,
+ wxRadioBox( wxWindow *parent, wxWindowID id, const wxString& title,
+ const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
+ int n = 0, const wxString choices[] = NULL,
+ int majorDim = 0, long style = wxRA_HORIZONTAL,
const wxString &name = wxRadioBoxNameStr );
- bool Create( wxWindow *parent, const wxWindowID id, const wxString& title,
- const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
- const int n = 0, const wxString choices[] = NULL,
- const int majorDim = 0, const long style = wxRA_HORIZONTAL,
+ bool Create( wxWindow *parent, wxWindowID id, const wxString& title,
+ const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
+ int n = 0, const wxString choices[] = NULL,
+ int majorDim = 0, long style = wxRA_HORIZONTAL,
const wxString &name = wxRadioBoxNameStr );
int FindString( const wxString& s) const;
- void SetSelection( const int n );
+ void SetSelection( int n );
int GetSelection(void) const;
- wxString GetString( const int n ) const;
+ wxString GetString( int n ) const;
wxString GetLabel(void) const;
void SetLabel( const wxString& label );
- void SetLabel( const int item, const wxString& label );
- void SetLabel( const int item, wxBitmap *bitmap );
- wxString GetLabel( const int item ) const;
- bool Show( const bool show );
- void Enable( const bool enable );
- void Enable( const int item, const bool enable );
- void Show( const int item, const bool show );
+ void SetLabel( int item, const wxString& label );
+ void SetLabel( int item, wxBitmap *bitmap );
+ wxString GetLabel( int item ) const;
+ bool Show( bool show );
+ void Enable( bool enable );
+ void Enable( int item, bool enable );
+ void Show( int item, bool show );
virtual wxString GetStringSelection(void) const;
virtual bool SetStringSelection( const wxString& s );
virtual int Number(void) const;
int GetNumberOfRowsOrCols(void) const;
- void SetNumberOfRowsOrCols( const int n );
-
+ void SetNumberOfRowsOrCols( int n );
+
private:
GtkRadioButton *m_radio;
public:
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 wxSize& size = wxDefaultSize,
- const long style = wxSB_HORIZONTAL,
+ long style = wxSB_HORIZONTAL,
const wxString& name = wxScrollBarNameStr );
~wxScrollBar(void);
- bool Create(wxWindow *parent, const wxWindowID id,
+ bool Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
- const long style = wxSB_HORIZONTAL,
+ long style = wxSB_HORIZONTAL,
const wxString& name = wxScrollBarNameStr);
int GetPosition(void) const;
int GetThumbSize() const;
int GetPageSize() const;
int GetRange() const;
- virtual void SetPosition( const int viewStart );
- virtual void SetScrollbar( const int position, const int thumbSize, const int range, const int pageSize,
- const bool refresh = TRUE );
+ virtual void SetPosition( int viewStart );
+ virtual void SetScrollbar( int position, int thumbSize, int range, int pageSize,
+ bool refresh = TRUE );
// Backward compatibility
int GetValue(void) const;
- void SetValue( const int viewStart );
+ void SetValue( int viewStart );
void GetValues( int *viewStart, int *viewLength, int *objectLength, int *pageLength) const;
int GetViewLength() const;
int GetObjectLength() const;
- void SetPageSize( const int pageLength );
- void SetObjectLength( const int objectLength );
- void SetViewLength( const int viewLength );
-
+ void SetPageSize( int pageLength );
+ void SetObjectLength( int objectLength );
+ void SetViewLength( int viewLength );
+
public:
GtkAdjustment *m_adjust;
public:
wxSlider(void);
- wxSlider( wxWindow *parent, const wxWindowID id,
- const int value, const int minValue, const int maxValue,
+ wxSlider( wxWindow *parent, wxWindowID id,
+ int value, int minValue, int maxValue,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
- const long style = wxSL_HORIZONTAL,
+ long style = wxSL_HORIZONTAL,
/* const wxValidator& validator = wxDefaultValidator, */
const wxString& name = wxSliderNameStr);
~wxSlider(void);
- bool Create(wxWindow *parent, const wxWindowID id,
- const int value, const int minValue, const int maxValue,
+ bool Create(wxWindow *parent, wxWindowID id,
+ int value, int minValue, int maxValue,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
- const long style = wxSL_HORIZONTAL,
+ long style = wxSL_HORIZONTAL,
/* const wxValidator& validator = wxDefaultValidator, */
const wxString& name = wxSliderNameStr);
virtual int GetValue(void) const;
- virtual void SetValue( const int );
+ virtual void SetValue( int );
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 SetRange( const int minValue, const int maxValue );
+ void SetRange( int minValue, int maxValue );
int GetMin(void) const;
int GetMax(void) const;
- void SetTickFreq( const int n, const int pos );
+ void SetTickFreq( int n, int pos );
int GetTickFreq(void) const;
- void SetPageSize( const int pageSize );
+ void SetPageSize( int pageSize );
int GetPageSize(void) const;
void ClearSel(void);
void ClearTicks(void);
- void SetLineSize( const int lineSize );
+ void SetLineSize( int lineSize );
int GetLineSize(void) const;
int GetSelEnd(void) const;
int GetSelStart(void) const;
- void SetSelection( const int minPos, const int maxPos );
- void SetThumbLength( const int len );
+ void SetSelection( int minPos, int maxPos );
+ void SetThumbLength( int len );
int GetThumbLength(void) const;
- void SetTick( const int tickPos );
+ void SetTick( int tickPos );
public:
public:
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 long style = 0, const wxString& name = wxStaticBitmapNameStr );
- bool Create( wxWindow *parent, const wxWindowID id, const wxBitmap& label,
+ long style = 0, const wxString& name = wxStaticBitmapNameStr );
+ bool Create( wxWindow *parent, wxWindowID id, const wxBitmap& label,
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 );
wxBitmap& GetBitmap(void) const { return (wxBitmap&)m_bitmap; }
wxStaticBox(void);
wxStaticBox( wxWindow *parent, wxWindowID id, const wxString &label,
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
- const long style = 0, const wxString &name = wxStaticBoxNameStr );
- bool Create( wxWindow *parent, wxWindowID id, const wxString &label,
+ long style = 0, const wxString &name = wxStaticBoxNameStr );
+ bool Create( wxWindow *parent, wxWindowID id, const wxString &label,
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__
wxStaticText(void);
wxStaticText( wxWindow *parent, wxWindowID id, const wxString &label,
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,
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;
void SetLabel( const wxString &label );
};
public:
wxToolBarTool(void) {};
- wxToolBarTool( wxToolBarGTK *owner, const int theIndex = 0,
- const wxBitmap& bitmap1 = wxNullBitmap, const wxBitmap& bitmap2 = wxNullBitmap,
- const bool toggle = FALSE, wxObject *clientData = NULL,
+ wxToolBarTool( wxToolBarGTK *owner, int theIndex = 0,
+ const wxBitmap& bitmap1 = wxNullBitmap, const wxBitmap& bitmap2 = wxNullBitmap,
+ bool toggle = FALSE, wxObject *clientData = NULL,
const wxString& shortHelpString = "", const wxString& longHelpString = "");
~wxToolBarTool(void);
public:
wxToolBarGTK(void);
- wxToolBarGTK( wxWindow *parent, const wxWindowID id,
+ wxToolBarGTK( wxWindow *parent, wxWindowID id,
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);
- bool Create( wxWindow *parent, const wxWindowID id,
+ bool Create( wxWindow *parent, wxWindowID id,
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.
virtual bool OnLeftClick(int toolIndex, bool toggleDown);
// If pushedBitmap is NULL, a reversed version of bitmap is
// created and used as the pushed/toggled image.
// If toggle is TRUE, the button toggles between the two states.
- virtual wxToolBarTool *AddTool( const int toolIndex, const wxBitmap& bitmap,
- const wxBitmap& pushedBitmap = wxNullBitmap, const bool toggle = FALSE,
- const float xPos = -1, const float yPos = -1, wxObject *clientData = NULL,
+ virtual wxToolBarTool *AddTool( int toolIndex, const wxBitmap& bitmap,
+ const wxBitmap& pushedBitmap = wxNullBitmap, bool toggle = FALSE,
+ float xPos = -1, float yPos = -1, wxObject *clientData = NULL,
const wxString& helpString1 = "", const wxString& helpString2 = "");
virtual void AddSeparator(void);
virtual void ClearTools(void);
- virtual void EnableTool(const int toolIndex, const bool enable);
- virtual void ToggleTool(const int toolIndex, const 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 wxObject *GetToolClientData(const int index) const;
+ virtual void EnableTool(int toolIndex, bool enable);
+ virtual void ToggleTool(int toolIndex, bool toggle); // toggle is TRUE if toggled on
+ virtual void SetToggle(int toolIndex, bool toggle); // Set this to be togglable (or not)
+ virtual wxObject *GetToolClientData(int index) const;
- virtual bool GetToolState(const int toolIndex) const;
- virtual bool GetToolEnabled(const int toolIndex) const;
+ virtual bool GetToolState(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); };
- virtual void SetToolPacking(const int packing);
- virtual void SetToolSeparation(const int separation);
-
+ virtual void SetToolPacking(int packing);
+ virtual void SetToolSeparation(int separation);
+
public:
GtkToolbar *m_toolbar;
public:
wxTextCtrl(void);
- wxTextCtrl( wxWindow *parent, const wxWindowID id, const wxString &value = "",
- const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
- const int style = 0, const wxString &name = wxTextCtrlNameStr );
- bool Create( wxWindow *parent, const wxWindowID id, const wxString &value = "",
- const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
- const int style = 0, const wxString &name = wxTextCtrlNameStr );
+ wxTextCtrl( wxWindow *parent, wxWindowID id, const wxString &value = "",
+ const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
+ int style = 0, const wxString &name = wxTextCtrlNameStr );
+ bool Create( wxWindow *parent, wxWindowID id, const wxString &value = "",
+ const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
+ int style = 0, const wxString &name = wxTextCtrlNameStr );
wxString GetValue(void) const;
void SetValue( const wxString &value );
void WriteText( const wxString &text );
bool IsModified(void);
void DiscardEdits(void);
/*
- wxString GetLineText( const long lineNo ) const;
+ wxString GetLineText( long lineNo ) const;
void OnDropFiles( wxDropFilesEvent &event );
- long PositionToXY( const long pos, long *x, long *y ) const;
- long XYToPosition( const long x, const long y );
+ long PositionToXY( long pos, long *x, long *y ) const;
+ long XYToPosition( long x, long y );
int GetNumberOfLines(void);
*/
- virtual void SetInsertionPoint( const long pos );
+ virtual void SetInsertionPoint( long pos );
virtual void SetInsertionPointEnd(void);
- virtual void SetEditable( const bool editable );
- virtual void SetSelection( const long from, const long to );
- void ShowPosition( const long pos );
+ virtual void SetEditable( bool editable );
+ virtual void SetSelection( long from, long to );
+ void ShowPosition( long pos );
virtual long GetInsertionPoint(void) const;
virtual long GetLastPosition(void) const;
- virtual void Remove( const long from, const long to );
- virtual void Replace( const long from, const long to, const wxString &value );
+ virtual void Remove( long from, long to );
+ virtual void Replace( long from, long to, const wxString &value );
void Cut(void);
void Copy(void);
void Paste(void);
int underflow(void);
wxTextCtrl& operator<<(const wxString& s);
- wxTextCtrl& operator<<(const int i);
- wxTextCtrl& operator<<(const long i);
- wxTextCtrl& operator<<(const float f);
- wxTextCtrl& operator<<(const double d);
+ wxTextCtrl& operator<<(int i);
+ wxTextCtrl& operator<<(long i);
+ wxTextCtrl& operator<<(float f);
+ wxTextCtrl& operator<<(double d);
wxTextCtrl& operator<<(const char c);
public:
public:
wxWindow(void);
- wxWindow( wxWindow *parent, const wxWindowID id,
- const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
- const long style = 0, const wxString &name = wxPanelNameStr );
- bool Create( wxWindow *parent, const wxWindowID id,
- const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
- const long style = 0, const wxString &name = wxPanelNameStr );
+ wxWindow( wxWindow *parent, wxWindowID id,
+ const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
+ long style = 0, const wxString &name = wxPanelNameStr );
+ bool Create( wxWindow *parent, wxWindowID id,
+ const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
+ long style = 0, const wxString &name = wxPanelNameStr );
virtual ~wxWindow(void);
- bool Close( const bool force = FALSE );
+ bool Close( bool force = FALSE );
virtual bool Destroy(void);
virtual bool DestroyChildren(void);
virtual void PrepareDC( wxDC &dc );
- virtual void SetSize( const int x, const int y, const int width, const int height,
- const int sizeFlags = wxSIZE_AUTO );
- virtual void SetSize( const int width, const int height );
- virtual void Move( const int x, const int y );
+ virtual void SetSize( int x, int y, int width, int height,
+ int sizeFlags = wxSIZE_AUTO );
+ virtual void SetSize( int width, int height );
+ virtual void Move( int x, int y );
virtual void GetSize( int *width, int *height ) const;
virtual void SetClientSize( int const width, int const height );
virtual void GetClientSize( int *width, int *height ) 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);
void OnSize( wxSizeEvent &event );
- virtual bool Show( const bool show );
- virtual void Enable( const bool enable );
- virtual void MakeModal( const bool modal );
+ virtual bool Show( bool show );
+ virtual void Enable( bool enable );
+ virtual void MakeModal( bool modal );
virtual bool IsEnabled(void) const { return m_isEnabled; };
virtual void SetFocus(void);
virtual bool OnClose(void);
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 bool IsExposed( const long x, const long y );
- virtual bool IsExposed( const long x, const long y, const long width, const long height );
-
+ virtual bool IsExposed( long x, long y );
+ virtual bool IsExposed( long x, long y, long width, long height );
+
virtual wxColour GetBackgroundColour(void) const;
virtual void SetBackgroundColour( const wxColour &colour );
virtual bool IsShown(void);
virtual bool IsRetained(void);
- virtual wxWindow *FindWindow( const long id );
+ virtual wxWindow *FindWindow( long id );
virtual wxWindow *FindWindow( const wxString& name );
void AllowDoubleClick( bool WXUNUSED(allow) ) {};
void SetDoubleClick( bool WXUNUSED(allow) ) {};
virtual void SetDropTarget( wxDropTarget *dropTarget );
virtual wxDropTarget *GetDropTarget() const;
- virtual void SetScrollbar( const int orient, const int pos, const int thumbVisible,
- const int range, const bool refresh = TRUE );
- virtual void SetScrollPos( const int orient, const int pos, const bool refresh = TRUE );
- virtual int GetScrollPos( const int orient ) const;
- virtual int GetScrollThumb( const int orient ) const;
- virtual int GetScrollRange( const int orient ) const;
- virtual void ScrollWindow( const int dx, const int dy, const wxRect* rect = NULL );
-
+ virtual void SetScrollbar( int orient, int pos, int thumbVisible,
+ int range, bool refresh = TRUE );
+ virtual void SetScrollPos( int orient, int pos, bool refresh = TRUE );
+ virtual int GetScrollPos( int orient ) const;
+ virtual int GetScrollThumb( int orient ) const;
+ virtual int GetScrollRange( int orient ) const;
+ virtual void ScrollWindow( int dx, int dy, const wxRect* rect = NULL );
+
public: // cannot get private going yet
- void PreCreation( wxWindow *parent, const wxWindowID id, const wxPoint &pos,
- const wxSize &size, const long style, const wxString &name );
+ void PreCreation( wxWindow *parent, wxWindowID id, const wxPoint &pos,
+ const wxSize &size, long style, const wxString &name );
void PostCreation(void);
bool HasVMT(void);
virtual void ImplementSetSize(void);
wxLayoutConstraints *GetConstraints(void) const;
void SetConstraints( wxLayoutConstraints *constraints );
- void SetAutoLayout( const bool autoLayout );
+ void SetAutoLayout( bool autoLayout );
bool GetAutoLayout(void) const;
bool Layout(void);
void SetSizer( wxSizer *sizer );
void RemoveConstraintReference(wxWindow *otherWin);
void DeleteRelatedConstraints(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 LayoutPhase2(int *noChanges);
- virtual bool DoPhase(const int);
+ virtual bool DoPhase(int);
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 SizerMove(const int x, const int y);
- virtual void SetSizeConstraint(const int x, const int y, const int w, const int h);
- virtual void MoveConstraint(const int x, const int y);
+ virtual void SizerSetSize(int x, int y, int w, int h);
+ virtual void SizerMove(int x, int y);
+ virtual void SetSizeConstraint(int x, int y, int w, int h);
+ virtual void MoveConstraint(int x, int y);
virtual void GetSizeConstraint(int *w, int *h) const ;
virtual void GetClientSizeConstraint(int *w, int *h) const ;
virtual void GetPositionConstraint(int *x, int *y) const ;
wxMask(void);
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(void);
public:
wxBitmap(void);
- wxBitmap( const int width, const int height, const int depth = -1 );
- wxBitmap( const char bits[], const int width, const int height, const int depth = 1 );
+ wxBitmap( int width, int height, int depth = -1 );
+ wxBitmap( const char bits[], int width, int height, int depth = 1 );
wxBitmap( char **bits );
wxBitmap( const wxBitmap& bmp );
wxBitmap( const wxBitmap* bmp );
- wxBitmap( const wxString &filename, const int type );
+ wxBitmap( const wxString &filename, int type );
~wxBitmap(void);
wxBitmap& operator = ( const wxBitmap& bmp );
bool operator == ( const wxBitmap& bmp );
int GetHeight(void) const;
int GetWidth(void) const;
int GetDepth(void) const;
- void SetHeight( const int height );
- void SetWidth( const int width );
- void SetDepth( const int depth );
+ void SetHeight( int height );
+ void SetWidth( int width );
+ void SetDepth( int depth );
wxMask *GetMask(void) const;
void SetMask( wxMask *mask );
- bool SaveFile( const wxString &name, const int type, wxPalette *palette = NULL );
- bool LoadFile( const wxString &name, const int type );
-
+ bool SaveFile( const wxString &name, int type, wxPalette *palette = NULL );
+ bool LoadFile( const wxString &name, int type );
+
wxPalette *GetPalette(void) const;
wxPalette *GetColourMap(void) const
{ return GetPalette(); };
wxBitmapButton(void);
wxBitmapButton( wxWindow *parent, wxWindowID id, const wxBitmap &bitmap,
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,
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 SetLabel( const wxString &label );
wxString GetLabel(void) const;
public:
wxBrush(void);
- wxBrush( const wxColour &colour, const int style );
- wxBrush( const wxString &colourName, const int style );
+ wxBrush( const wxColour &colour, int style );
+ wxBrush( const wxString &colourName, int style );
wxBrush( const wxBitmap &stippleBitmap );
wxBrush( const wxBrush &brush );
wxBrush( const wxBrush *brush );
wxButton(void);
wxButton( wxWindow *parent, wxWindowID id, const wxString &label,
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,
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 SetLabel( const wxString &label );
wxString GetLabel(void) const;
wxCheckBox(void);
wxCheckBox( wxWindow *parent, wxWindowID id, const wxString &label,
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,
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
- const long style = 0, const wxString &name = wxCheckBoxNameStr );
- void SetValue( const bool state );
+ long style = 0, const wxString &name = wxCheckBoxNameStr );
+ void SetValue( bool state );
bool GetValue(void) const;
};
public:
wxChoice(void);
- wxChoice( wxWindow *parent, const wxWindowID id,
- const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
- const int n = 0, const wxString choices[] = NULL,
- const long style = 0, const wxString &name = wxChoiceNameStr );
- bool Create( wxWindow *parent, const wxWindowID id,
- const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
- const int n = 0, const wxString choices[] = NULL,
- const long style = 0, const wxString &name = wxChoiceNameStr );
+ wxChoice( wxWindow *parent, wxWindowID id,
+ const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
+ int n = 0, const wxString choices[] = NULL,
+ long style = 0, const wxString &name = wxChoiceNameStr );
+ bool Create( wxWindow *parent, wxWindowID id,
+ const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
+ int n = 0, const wxString choices[] = NULL,
+ long style = 0, const wxString &name = wxChoiceNameStr );
void Append( const wxString &item );
void Clear(void);
int FindString( const wxString &string ) const;
int GetColumns(void) const;
int GetSelection(void);
- wxString GetString( const int n ) const;
+ wxString GetString( int n ) const;
wxString GetStringSelection(void) const;
int Number(void) const;
- void SetColumns( const int n = 1 );
- void SetSelection( const int n );
+ void SetColumns( int n = 1 );
+ void SetSelection( int n );
void SetStringSelection( const wxString &string );
};
public:
inline wxComboBox(void) {}
- inline wxComboBox(wxWindow *parent, const wxWindowID id,
+ inline wxComboBox(wxWindow *parent, wxWindowID id,
const wxString& value = wxEmptyString,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
- const int n = 0, const wxString choices[] = NULL,
- const long style = 0,
+ int n = 0, const wxString choices[] = NULL,
+ long style = 0,
const wxString& name = wxComboBoxNameStr)
{
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 wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
- const int n = 0, const wxString choices[] = NULL,
- const long style = 0,
+ int n = 0, const wxString choices[] = NULL,
+ long style = 0,
const wxString& name = wxComboBoxNameStr);
// List functions
void Clear(void);
void Append( const wxString &item );
void Append( const wxString &item, char* clientData );
- void Delete( const int n );
+ void Delete( int n );
int FindString( const wxString &item );
- char* GetClientData( const int n );
- void SetClientData( const int n, char * clientData );
+ char* GetClientData( int n );
+ void SetClientData( int n, char * clientData );
int GetSelection(void) const;
- wxString GetString( const int n ) const;
+ wxString GetString( int n ) const;
wxString GetStringSelection(void) const;
int Number(void) const;
- void SetSelection( const int n );
-
+ void SetSelection( int n );
+
// Text field functions
wxString GetValue(void) const ;
void SetValue(const wxString& value);
void Copy(void);
void Cut(void);
void Paste(void);
- void SetInsertionPoint(const long pos);
+ void SetInsertionPoint(long pos);
void SetInsertionPointEnd(void);
long GetInsertionPoint(void) const ;
long GetLastPosition(void) const ;
- void Replace(const long from, const long to, const wxString& value);
- void Remove(const long from, const long to);
- void SetSelection(const long from, const long to);
- void SetEditable(const bool editable);
-
+ void Replace(long from, long to, const wxString& value);
+ void Remove(long from, long to);
+ void SetSelection(long from, long to);
+ void SetEditable(bool editable);
+
private:
wxList m_clientData;
wxControl(void);
wxControl( wxWindow *parent, wxWindowID id,
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 SetLabel( const wxString &label );
virtual wxString GetLabel(void) const;
public:
wxCursor(void);
- wxCursor( const int cursorId );
+ wxCursor( int cursorId );
wxCursor( const wxCursor &cursor );
wxCursor( const wxCursor *cursor );
~wxCursor(void);
wxDialog(void);
wxDialog( wxWindow *parent, wxWindowID id, const wxString &title,
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,
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);
void SetTitle(const wxString& title);
wxString GetTitle(void) const;
/*
void OnCharHook(wxKeyEvent& event);
*/
- virtual bool Show( const bool show );
+ virtual bool Show( bool show );
virtual int ShowModal(void);
virtual void EndModal(int retCode);
virtual bool IsModal(void) const { return ((GetWindowStyleFlag() & wxDIALOG_MODAL) == wxDIALOG_MODAL); }
wxDragSource( wxWindow *win );
~wxDragSource(void);
- void SetData( char *data, const long size );
+ void SetData( char *data, long size );
void Start( int x, int y );
public:
public:
wxFrame(void);
- wxFrame( wxWindow *parent, const wxWindowID id, const wxString &title,
- const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
- const long style = wxDEFAULT_FRAME_STYLE, const wxString &name = wxFrameNameStr );
- bool Create( wxWindow *parent, const wxWindowID id, const wxString &title,
- const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
- const long style = wxDEFAULT_FRAME_STYLE, const wxString &name = wxFrameNameStr );
+ wxFrame( wxWindow *parent, wxWindowID id, const wxString &title,
+ const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
+ long style = wxDEFAULT_FRAME_STYLE, const wxString &name = wxFrameNameStr );
+ bool Create( wxWindow *parent, wxWindowID id, const wxString &title,
+ const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
+ long style = wxDEFAULT_FRAME_STYLE, const wxString &name = wxFrameNameStr );
~wxFrame(void);
bool Destroy(void);
void OnCloseWindow( wxCloseEvent& event );
- virtual bool Show( const bool show );
- virtual void Enable( const bool enable );
+ virtual bool Show( bool show );
+ virtual void Enable( bool enable );
virtual void GetClientSize( int *width, int *height ) const;
void OnSize( wxSizeEvent &event );
void SetMenuBar( wxMenuBar *menuBar );
- virtual bool CreateStatusBar( const int number = 1 );
- virtual void SetStatusText( const wxString &text, const int number = 0 );
- virtual void SetStatusWidths( const int n, const int *width );
+ virtual bool CreateStatusBar( int number = 1 );
+ virtual void SetStatusText( const wxString &text, int number = 0 );
+ virtual void SetStatusWidths( int n, int *width );
wxStatusBar *GetStatusBar(void);
wxMenuBar *GetMenuBar(void);
void SetTitle( const wxString &title );
public:
inline wxGauge(void) { m_rangeMax = 0; m_gaugePos = 0; m_useProgressBar = TRUE; }
- inline wxGauge(wxWindow *parent, const wxWindowID id,
- const int range,
+ inline wxGauge(wxWindow *parent, wxWindowID id,
+ int range,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
- const long style = wxGA_HORIZONTAL,
+ long style = wxGA_HORIZONTAL,
const wxString& name = wxGaugeNameStr)
{
Create(parent, id, range, pos, size, style, name);
};
- bool Create(wxWindow *parent, const wxWindowID id,
- const int range,
+ bool Create(wxWindow *parent, wxWindowID id,
+ int range,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
- const long style = wxGA_HORIZONTAL,
+ long style = wxGA_HORIZONTAL,
const wxString& name = wxGaugeNameStr );
- void SetShadowWidth( const int WXUNUSED(w) ) {};
- void SetBezelFace( const int WXUNUSED(w) ) {};
- void SetRange( const int r );
- void SetValue( const int pos );
+ void SetShadowWidth( int WXUNUSED(w) ) {};
+ void SetBezelFace( int WXUNUSED(w) ) {};
+ void SetRange( int r );
+ void SetValue( int pos );
int GetShadowWidth(void) const { return 0; };
int GetBezelFace(void) const { return 0; };
int GetRange(void) const;
inline wxIcon(const wxIcon& 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 ) {};
inline wxIcon& operator = (const wxIcon& icon) { if (*this == icon) return (*this); Ref(icon); return *this; }
wxListBox(void);
wxListBox( wxWindow *parent, wxWindowID id,
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
- const int n = 0, const wxString choices[] = NULL,
- const long style = 0, const wxString &name = wxListBoxNameStr );
- bool Create( wxWindow *parent, wxWindowID id,
+ int n = 0, const wxString choices[] = NULL,
+ long style = 0, const wxString &name = wxListBoxNameStr );
+ bool Create( wxWindow *parent, wxWindowID id,
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
- const int n = 0, const wxString choices[] = NULL,
- const long style = 0, const wxString &name = wxListBoxNameStr );
+ int n = 0, const wxString choices[] = NULL,
+ long style = 0, const wxString &name = wxListBoxNameStr );
void Append( const wxString &item );
void Append( const wxString &item, char *clientData );
void Clear(void);
void Delete( int n );
void Deselect( int n );
int FindString( const wxString &item ) const;
- char *GetClientData( const int n ) const;
+ char *GetClientData( int n ) const;
int GetSelection(void) const;
int GetSelections( class wxArrayInt &) const;
wxString GetString( int n ) const;
wxString GetStringSelection(void) const;
int Number(void);
- bool Selected( const int n );
- void Set( const int n, const wxString *choices );
- void SetClientData( const int n, char *clientData );
+ bool Selected( int n );
+ void Set( int n, const wxString *choices );
+ void SetClientData( int n, char *clientData );
void SetFirstItem( int n );
void SetFirstItem( const wxString &item );
- void SetSelection( const int n, const bool select = TRUE );
- void SetString( const int n, const wxString &string );
- void SetStringSelection( const wxString &string, const bool select = TRUE );
-
+ void SetSelection( int n, bool select = TRUE );
+ void SetString( int n, const wxString &string );
+ void SetStringSelection( const wxString &string, bool select = TRUE );
+
private:
GtkList *m_list;
wxMDIParentFrame(void);
wxMDIParentFrame( wxWindow *parent,
- const wxWindowID id, const wxString& title,
+ wxWindowID id, const wxString& title,
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 );
~wxMDIParentFrame(void);
bool Create( wxWindow *parent,
- const wxWindowID id, const wxString& title,
+ wxWindowID id, const wxString& title,
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 );
void OnSize( wxSizeEvent& event );
wxMDIChildFrame(void);
wxMDIChildFrame( wxMDIParentFrame *parent,
- const wxWindowID id, const wxString& title,
+ wxWindowID id, const wxString& title,
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);
bool Create( wxMDIParentFrame *parent,
- const wxWindowID id, const wxString& title,
+ wxWindowID id, const wxString& title,
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 );
// no status bars in wxGTK
- virtual bool CreateStatusBar( const int WXUNUSED(number) = 1 ) { return FALSE; };
- virtual void SetStatusText( const wxString &WXUNUSED(text), const int WXUNUSED(number) ) {};
- virtual void SetStatusWidths( const int WXUNUSED(n), const int *WXUNUSED(width) ) {};
-
+ virtual bool CreateStatusBar( int WXUNUSED(number) = 1 ) { return FALSE; };
+ virtual void SetStatusText( const wxString &WXUNUSED(text), int WXUNUSED(number) ) {};
+ virtual void SetStatusWidths( int WXUNUSED(n), int *WXUNUSED(width) ) {};
+
virtual void Maximize(void) {};
virtual void Restore(void) {};
virtual void Activate(void);
public:
wxMDIClientWindow(void);
- wxMDIClientWindow( wxMDIParentFrame *parent, const long style = 0 );
+ wxMDIClientWindow( wxMDIParentFrame *parent, long style = 0 );
~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 );
};
wxMenu( const wxString &title = "" );
void AppendSeparator(void);
- void Append( const int id, const wxString &item,
- const wxString &helpStr = "", const bool checkable = FALSE );
- void Append( const int id, const wxString &item,
+ void Append( int id, const wxString &item,
+ const wxString &helpStr = "", bool checkable = FALSE );
+ void Append( int id, const wxString &item,
wxMenu *subMenu, const wxString &helpStr = "" );
int FindItem( const wxString itemString ) const;
void Break(void) {};
- void Enable( const int id, const bool enable );
- bool Enabled( const int id ) const;
- void SetLabel( const int id, const wxString &label );
-
+ void Enable( int id, bool enable );
+ bool Enabled( int id ) const;
+ void SetLabel( int id, const wxString &label );
+
public:
int FindMenuIdByMenuItem( GtkWidget *menuItem ) const;
wxNotebook();
// the same arguments as for wxControl (@@@ any special styles?)
wxNotebook(wxWindow *parent,
- const wxWindowID id,
+ wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
- const long style = 0,
+ long style = 0,
const wxString& name = "notebook");
// Create() function
bool Create(wxWindow *parent,
- const wxWindowID id,
+ wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
- const long style = 0,
+ long style = 0,
const wxString& name = "notebook");
// dtor
~wxNotebook();
public:
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(void);
bool operator != ( const wxPalette& palette );
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;
- 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
};
void SetColour( const wxColour &colour );
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 SetJoin( int joinStyle );
void SetStyle( int style );
public:
wxRadioBox(void);
- wxRadioBox( wxWindow *parent, const wxWindowID id, const wxString& title,
- const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
- const int n = 0, const wxString choices[] = NULL,
- const int majorDim = 0, const long style = wxRA_HORIZONTAL,
+ wxRadioBox( wxWindow *parent, wxWindowID id, const wxString& title,
+ const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
+ int n = 0, const wxString choices[] = NULL,
+ int majorDim = 0, long style = wxRA_HORIZONTAL,
const wxString &name = wxRadioBoxNameStr );
- bool Create( wxWindow *parent, const wxWindowID id, const wxString& title,
- const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
- const int n = 0, const wxString choices[] = NULL,
- const int majorDim = 0, const long style = wxRA_HORIZONTAL,
+ bool Create( wxWindow *parent, wxWindowID id, const wxString& title,
+ const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
+ int n = 0, const wxString choices[] = NULL,
+ int majorDim = 0, long style = wxRA_HORIZONTAL,
const wxString &name = wxRadioBoxNameStr );
int FindString( const wxString& s) const;
- void SetSelection( const int n );
+ void SetSelection( int n );
int GetSelection(void) const;
- wxString GetString( const int n ) const;
+ wxString GetString( int n ) const;
wxString GetLabel(void) const;
void SetLabel( const wxString& label );
- void SetLabel( const int item, const wxString& label );
- void SetLabel( const int item, wxBitmap *bitmap );
- wxString GetLabel( const int item ) const;
- bool Show( const bool show );
- void Enable( const bool enable );
- void Enable( const int item, const bool enable );
- void Show( const int item, const bool show );
+ void SetLabel( int item, const wxString& label );
+ void SetLabel( int item, wxBitmap *bitmap );
+ wxString GetLabel( int item ) const;
+ bool Show( bool show );
+ void Enable( bool enable );
+ void Enable( int item, bool enable );
+ void Show( int item, bool show );
virtual wxString GetStringSelection(void) const;
virtual bool SetStringSelection( const wxString& s );
virtual int Number(void) const;
int GetNumberOfRowsOrCols(void) const;
- void SetNumberOfRowsOrCols( const int n );
-
+ void SetNumberOfRowsOrCols( int n );
+
private:
GtkRadioButton *m_radio;
public:
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 wxSize& size = wxDefaultSize,
- const long style = wxSB_HORIZONTAL,
+ long style = wxSB_HORIZONTAL,
const wxString& name = wxScrollBarNameStr );
~wxScrollBar(void);
- bool Create(wxWindow *parent, const wxWindowID id,
+ bool Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
- const long style = wxSB_HORIZONTAL,
+ long style = wxSB_HORIZONTAL,
const wxString& name = wxScrollBarNameStr);
int GetPosition(void) const;
int GetThumbSize() const;
int GetPageSize() const;
int GetRange() const;
- virtual void SetPosition( const int viewStart );
- virtual void SetScrollbar( const int position, const int thumbSize, const int range, const int pageSize,
- const bool refresh = TRUE );
+ virtual void SetPosition( int viewStart );
+ virtual void SetScrollbar( int position, int thumbSize, int range, int pageSize,
+ bool refresh = TRUE );
// Backward compatibility
int GetValue(void) const;
- void SetValue( const int viewStart );
+ void SetValue( int viewStart );
void GetValues( int *viewStart, int *viewLength, int *objectLength, int *pageLength) const;
int GetViewLength() const;
int GetObjectLength() const;
- void SetPageSize( const int pageLength );
- void SetObjectLength( const int objectLength );
- void SetViewLength( const int viewLength );
-
+ void SetPageSize( int pageLength );
+ void SetObjectLength( int objectLength );
+ void SetViewLength( int viewLength );
+
public:
GtkAdjustment *m_adjust;
public:
wxSlider(void);
- wxSlider( wxWindow *parent, const wxWindowID id,
- const int value, const int minValue, const int maxValue,
+ wxSlider( wxWindow *parent, wxWindowID id,
+ int value, int minValue, int maxValue,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
- const long style = wxSL_HORIZONTAL,
+ long style = wxSL_HORIZONTAL,
/* const wxValidator& validator = wxDefaultValidator, */
const wxString& name = wxSliderNameStr);
~wxSlider(void);
- bool Create(wxWindow *parent, const wxWindowID id,
- const int value, const int minValue, const int maxValue,
+ bool Create(wxWindow *parent, wxWindowID id,
+ int value, int minValue, int maxValue,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
- const long style = wxSL_HORIZONTAL,
+ long style = wxSL_HORIZONTAL,
/* const wxValidator& validator = wxDefaultValidator, */
const wxString& name = wxSliderNameStr);
virtual int GetValue(void) const;
- virtual void SetValue( const int );
+ virtual void SetValue( int );
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 SetRange( const int minValue, const int maxValue );
+ void SetRange( int minValue, int maxValue );
int GetMin(void) const;
int GetMax(void) const;
- void SetTickFreq( const int n, const int pos );
+ void SetTickFreq( int n, int pos );
int GetTickFreq(void) const;
- void SetPageSize( const int pageSize );
+ void SetPageSize( int pageSize );
int GetPageSize(void) const;
void ClearSel(void);
void ClearTicks(void);
- void SetLineSize( const int lineSize );
+ void SetLineSize( int lineSize );
int GetLineSize(void) const;
int GetSelEnd(void) const;
int GetSelStart(void) const;
- void SetSelection( const int minPos, const int maxPos );
- void SetThumbLength( const int len );
+ void SetSelection( int minPos, int maxPos );
+ void SetThumbLength( int len );
int GetThumbLength(void) const;
- void SetTick( const int tickPos );
+ void SetTick( int tickPos );
public:
public:
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 long style = 0, const wxString& name = wxStaticBitmapNameStr );
- bool Create( wxWindow *parent, const wxWindowID id, const wxBitmap& label,
+ long style = 0, const wxString& name = wxStaticBitmapNameStr );
+ bool Create( wxWindow *parent, wxWindowID id, const wxBitmap& label,
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 );
wxBitmap& GetBitmap(void) const { return (wxBitmap&)m_bitmap; }
wxStaticBox(void);
wxStaticBox( wxWindow *parent, wxWindowID id, const wxString &label,
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
- const long style = 0, const wxString &name = wxStaticBoxNameStr );
- bool Create( wxWindow *parent, wxWindowID id, const wxString &label,
+ long style = 0, const wxString &name = wxStaticBoxNameStr );
+ bool Create( wxWindow *parent, wxWindowID id, const wxString &label,
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__
wxStaticText(void);
wxStaticText( wxWindow *parent, wxWindowID id, const wxString &label,
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,
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;
void SetLabel( const wxString &label );
};
public:
wxToolBarTool(void) {};
- wxToolBarTool( wxToolBarGTK *owner, const int theIndex = 0,
- const wxBitmap& bitmap1 = wxNullBitmap, const wxBitmap& bitmap2 = wxNullBitmap,
- const bool toggle = FALSE, wxObject *clientData = NULL,
+ wxToolBarTool( wxToolBarGTK *owner, int theIndex = 0,
+ const wxBitmap& bitmap1 = wxNullBitmap, const wxBitmap& bitmap2 = wxNullBitmap,
+ bool toggle = FALSE, wxObject *clientData = NULL,
const wxString& shortHelpString = "", const wxString& longHelpString = "");
~wxToolBarTool(void);
public:
wxToolBarGTK(void);
- wxToolBarGTK( wxWindow *parent, const wxWindowID id,
+ wxToolBarGTK( wxWindow *parent, wxWindowID id,
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);
- bool Create( wxWindow *parent, const wxWindowID id,
+ bool Create( wxWindow *parent, wxWindowID id,
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.
virtual bool OnLeftClick(int toolIndex, bool toggleDown);
// If pushedBitmap is NULL, a reversed version of bitmap is
// created and used as the pushed/toggled image.
// If toggle is TRUE, the button toggles between the two states.
- virtual wxToolBarTool *AddTool( const int toolIndex, const wxBitmap& bitmap,
- const wxBitmap& pushedBitmap = wxNullBitmap, const bool toggle = FALSE,
- const float xPos = -1, const float yPos = -1, wxObject *clientData = NULL,
+ virtual wxToolBarTool *AddTool( int toolIndex, const wxBitmap& bitmap,
+ const wxBitmap& pushedBitmap = wxNullBitmap, bool toggle = FALSE,
+ float xPos = -1, float yPos = -1, wxObject *clientData = NULL,
const wxString& helpString1 = "", const wxString& helpString2 = "");
virtual void AddSeparator(void);
virtual void ClearTools(void);
- virtual void EnableTool(const int toolIndex, const bool enable);
- virtual void ToggleTool(const int toolIndex, const 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 wxObject *GetToolClientData(const int index) const;
+ virtual void EnableTool(int toolIndex, bool enable);
+ virtual void ToggleTool(int toolIndex, bool toggle); // toggle is TRUE if toggled on
+ virtual void SetToggle(int toolIndex, bool toggle); // Set this to be togglable (or not)
+ virtual wxObject *GetToolClientData(int index) const;
- virtual bool GetToolState(const int toolIndex) const;
- virtual bool GetToolEnabled(const int toolIndex) const;
+ virtual bool GetToolState(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); };
- virtual void SetToolPacking(const int packing);
- virtual void SetToolSeparation(const int separation);
-
+ virtual void SetToolPacking(int packing);
+ virtual void SetToolSeparation(int separation);
+
public:
GtkToolbar *m_toolbar;
public:
wxTextCtrl(void);
- wxTextCtrl( wxWindow *parent, const wxWindowID id, const wxString &value = "",
- const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
- const int style = 0, const wxString &name = wxTextCtrlNameStr );
- bool Create( wxWindow *parent, const wxWindowID id, const wxString &value = "",
- const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
- const int style = 0, const wxString &name = wxTextCtrlNameStr );
+ wxTextCtrl( wxWindow *parent, wxWindowID id, const wxString &value = "",
+ const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
+ int style = 0, const wxString &name = wxTextCtrlNameStr );
+ bool Create( wxWindow *parent, wxWindowID id, const wxString &value = "",
+ const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
+ int style = 0, const wxString &name = wxTextCtrlNameStr );
wxString GetValue(void) const;
void SetValue( const wxString &value );
void WriteText( const wxString &text );
bool IsModified(void);
void DiscardEdits(void);
/*
- wxString GetLineText( const long lineNo ) const;
+ wxString GetLineText( long lineNo ) const;
void OnDropFiles( wxDropFilesEvent &event );
- long PositionToXY( const long pos, long *x, long *y ) const;
- long XYToPosition( const long x, const long y );
+ long PositionToXY( long pos, long *x, long *y ) const;
+ long XYToPosition( long x, long y );
int GetNumberOfLines(void);
*/
- virtual void SetInsertionPoint( const long pos );
+ virtual void SetInsertionPoint( long pos );
virtual void SetInsertionPointEnd(void);
- virtual void SetEditable( const bool editable );
- virtual void SetSelection( const long from, const long to );
- void ShowPosition( const long pos );
+ virtual void SetEditable( bool editable );
+ virtual void SetSelection( long from, long to );
+ void ShowPosition( long pos );
virtual long GetInsertionPoint(void) const;
virtual long GetLastPosition(void) const;
- virtual void Remove( const long from, const long to );
- virtual void Replace( const long from, const long to, const wxString &value );
+ virtual void Remove( long from, long to );
+ virtual void Replace( long from, long to, const wxString &value );
void Cut(void);
void Copy(void);
void Paste(void);
int underflow(void);
wxTextCtrl& operator<<(const wxString& s);
- wxTextCtrl& operator<<(const int i);
- wxTextCtrl& operator<<(const long i);
- wxTextCtrl& operator<<(const float f);
- wxTextCtrl& operator<<(const double d);
+ wxTextCtrl& operator<<(int i);
+ wxTextCtrl& operator<<(long i);
+ wxTextCtrl& operator<<(float f);
+ wxTextCtrl& operator<<(double d);
wxTextCtrl& operator<<(const char c);
public:
public:
wxWindow(void);
- wxWindow( wxWindow *parent, const wxWindowID id,
- const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
- const long style = 0, const wxString &name = wxPanelNameStr );
- bool Create( wxWindow *parent, const wxWindowID id,
- const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
- const long style = 0, const wxString &name = wxPanelNameStr );
+ wxWindow( wxWindow *parent, wxWindowID id,
+ const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
+ long style = 0, const wxString &name = wxPanelNameStr );
+ bool Create( wxWindow *parent, wxWindowID id,
+ const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
+ long style = 0, const wxString &name = wxPanelNameStr );
virtual ~wxWindow(void);
- bool Close( const bool force = FALSE );
+ bool Close( bool force = FALSE );
virtual bool Destroy(void);
virtual bool DestroyChildren(void);
virtual void PrepareDC( wxDC &dc );
- virtual void SetSize( const int x, const int y, const int width, const int height,
- const int sizeFlags = wxSIZE_AUTO );
- virtual void SetSize( const int width, const int height );
- virtual void Move( const int x, const int y );
+ virtual void SetSize( int x, int y, int width, int height,
+ int sizeFlags = wxSIZE_AUTO );
+ virtual void SetSize( int width, int height );
+ virtual void Move( int x, int y );
virtual void GetSize( int *width, int *height ) const;
virtual void SetClientSize( int const width, int const height );
virtual void GetClientSize( int *width, int *height ) 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);
void OnSize( wxSizeEvent &event );
- virtual bool Show( const bool show );
- virtual void Enable( const bool enable );
- virtual void MakeModal( const bool modal );
+ virtual bool Show( bool show );
+ virtual void Enable( bool enable );
+ virtual void MakeModal( bool modal );
virtual bool IsEnabled(void) const { return m_isEnabled; };
virtual void SetFocus(void);
virtual bool OnClose(void);
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 bool IsExposed( const long x, const long y );
- virtual bool IsExposed( const long x, const long y, const long width, const long height );
-
+ virtual bool IsExposed( long x, long y );
+ virtual bool IsExposed( long x, long y, long width, long height );
+
virtual wxColour GetBackgroundColour(void) const;
virtual void SetBackgroundColour( const wxColour &colour );
virtual bool IsShown(void);
virtual bool IsRetained(void);
- virtual wxWindow *FindWindow( const long id );
+ virtual wxWindow *FindWindow( long id );
virtual wxWindow *FindWindow( const wxString& name );
void AllowDoubleClick( bool WXUNUSED(allow) ) {};
void SetDoubleClick( bool WXUNUSED(allow) ) {};
virtual void SetDropTarget( wxDropTarget *dropTarget );
virtual wxDropTarget *GetDropTarget() const;
- virtual void SetScrollbar( const int orient, const int pos, const int thumbVisible,
- const int range, const bool refresh = TRUE );
- virtual void SetScrollPos( const int orient, const int pos, const bool refresh = TRUE );
- virtual int GetScrollPos( const int orient ) const;
- virtual int GetScrollThumb( const int orient ) const;
- virtual int GetScrollRange( const int orient ) const;
- virtual void ScrollWindow( const int dx, const int dy, const wxRect* rect = NULL );
-
+ virtual void SetScrollbar( int orient, int pos, int thumbVisible,
+ int range, bool refresh = TRUE );
+ virtual void SetScrollPos( int orient, int pos, bool refresh = TRUE );
+ virtual int GetScrollPos( int orient ) const;
+ virtual int GetScrollThumb( int orient ) const;
+ virtual int GetScrollRange( int orient ) const;
+ virtual void ScrollWindow( int dx, int dy, const wxRect* rect = NULL );
+
public: // cannot get private going yet
- void PreCreation( wxWindow *parent, const wxWindowID id, const wxPoint &pos,
- const wxSize &size, const long style, const wxString &name );
+ void PreCreation( wxWindow *parent, wxWindowID id, const wxPoint &pos,
+ const wxSize &size, long style, const wxString &name );
void PostCreation(void);
bool HasVMT(void);
virtual void ImplementSetSize(void);
wxLayoutConstraints *GetConstraints(void) const;
void SetConstraints( wxLayoutConstraints *constraints );
- void SetAutoLayout( const bool autoLayout );
+ void SetAutoLayout( bool autoLayout );
bool GetAutoLayout(void) const;
bool Layout(void);
void SetSizer( wxSizer *sizer );
void RemoveConstraintReference(wxWindow *otherWin);
void DeleteRelatedConstraints(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 LayoutPhase2(int *noChanges);
- virtual bool DoPhase(const int);
+ virtual bool DoPhase(int);
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 SizerMove(const int x, const int y);
- virtual void SetSizeConstraint(const int x, const int y, const int w, const int h);
- virtual void MoveConstraint(const int x, const int y);
+ virtual void SizerSetSize(int x, int y, int w, int h);
+ virtual void SizerMove(int x, int y);
+ virtual void SetSizeConstraint(int x, int y, int w, int h);
+ virtual void MoveConstraint(int x, int y);
virtual void GetSizeConstraint(int *w, int *h) const ;
virtual void GetClientSizeConstraint(int *w, int *h) const ;
virtual void GetPositionConstraint(int *x, int *y) const ;
unsigned int key_type;
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);
- 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.
// With a key and a value, the *value* will be checked
// e.g. 1 + 2 = 3, 2 + 1 = 3.
// key and value are NOT necessarily the same
- void Put(const long key, const long value, wxObject *object);
- void Put(const long key, const char *value, wxObject *object);
+ void Put(long key, long value, wxObject *object);
+ void Put(long key, const char *value, wxObject *object);
// 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);
// key and value not the same
- wxObject *Get(const long key, const long value) const;
- wxObject *Get(const long key, const char *value) const;
+ wxObject *Get(long key, long value) const;
+ wxObject *Get(long key, const char *value) const;
// key and value are the same
- wxObject *Get(const long value) const;
+ wxObject *Get(long value) const;
wxObject *Get(const char *value) const;
// Deletes entry and returns data if found
- wxObject *Delete(const long key);
+ wxObject *Delete(long key);
wxObject *Delete(const char *key);
- wxObject *Delete(const long key, const int value);
- wxObject *Delete(const long key, const char *value);
+ wxObject *Delete(long key, int value);
+ wxObject *Delete(long key, const char *value);
// Construct your own integer key from a string, e.g. in case
// you need to combine it with something
void BeginFind(void);
wxNode *Next(void);
- void DeleteContents(const bool flag);
+ void DeleteContents(bool flag);
void Clear(void);
};
~wxSizer(void);
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
- void SetSize(const int w, const int h) { wxWindow::SetSize(w, h); }
- virtual void Move(const int x, const int y);
+ void SetSize(int w, int h) { wxWindow::SetSize(w, h); }
+ virtual void Move(int x, int y);
virtual void GetSize(int *w, int *h) const;
inline virtual void GetClientSize(int *w, int *h) const { GetSize(w, h); }
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); }
- inline void SizerMove(const int x, const int y)
+ inline void SizerMove(int x, int y)
{ Move(x, y); }
virtual void SetBorder(int w, int h);
~wxRowColSizer(void);
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
- 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 bool GetRowOrCol(void) { return rowOrCol; }
wxList(void);
wxList(const unsigned int the_key_type);
- wxList(const int N, wxObject *Objects[]);
+ wxList(int N, wxObject *Objects[]);
wxList(wxObject *object, ...);
#ifdef USE_STORABLE_CLASSES
wxNode *Insert(wxNode *position, wxObject *object);
// Keyed append
- wxNode *Append(const long key, wxObject *object);
+ wxNode *Append(long key, wxObject *object);
wxNode *Append(const char *key, wxObject *object);
bool DeleteNode(wxNode *node);
inline wxNode *First(void) const { return first_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
- wxNode *Find(const long key) const;
+ wxNode *Find(long key) const;
wxNode *Find(const char *key) 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
// when deleting nodes
// this function allows the sorting of arbitrary lists by giving
virtual wxNode *Add(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 bool Member(const char *s) const;
};
virtual void OnIdle(wxIdleEvent& event);
- // Windows specific. Intercept keyboard input.
-#if WXWIN_COMPATIBILITY == 2
- virtual bool OldOnCharHook(wxKeyEvent& event);
-#endif
-
// Generic
virtual bool OnInit(void) { return FALSE; };
// Returns TRUE if more idle time is requested.
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; }
// Creates a log object
// Construct a mask from a bitmap and a palette index indicating
// 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).
wxMask(const wxBitmap& bitmap);
~wxMask(void);
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);
// Implementation
public:
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 LoadFile(wxBitmap *bitmap, const wxString& name, const long flags,
+ virtual bool Create(wxBitmap *bitmap, void *data, long flags, int width, int height, int depth = 1);
+ virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
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 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 GetExtension(void) const { return m_extension; }
inline long GetType(void) const { return m_type; }
inline wxBitmap(const wxBitmap* bitmap) { if (bitmap) Ref(*bitmap); if ( wxTheBitmapList ) wxTheBitmapList->AddBitmap(this); }
// 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
class wxItem;
#endif
// 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
- 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
- wxBitmap(const int width, const int height, const int depth = -1);
+ wxBitmap(int width, int height, int depth = -1);
~wxBitmap(void);
- virtual bool Create(const int width, const int height, const int depth = -1);
- virtual bool Create(void *data, const long type, const int width, const int height, const int depth = 1);
- virtual bool LoadFile(const wxString& name, const long type = wxBITMAP_TYPE_BMP_RESOURCE);
- virtual bool SaveFile(const wxString& name, const int type, const wxPalette *cmap = NULL);
+ virtual bool Create(int width, int height, int depth = -1);
+ virtual bool Create(void *data, long type, int width, int height, int depth = 1);
+ virtual bool LoadFile(const wxString& name, long type = wxBITMAP_TYPE_BMP_RESOURCE);
+ 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 int GetWidth(void) const { return (M_BITMAPDATA ? M_BITMAPDATA->m_width : 0); }
DECLARE_DYNAMIC_CLASS(wxBitmapButton)
public:
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 wxSize& size = wxDefaultSize, const long style = wxBU_AUTODRAW,
+ const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxButtonNameStr)
{
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 wxSize& size = wxDefaultSize, const long style = wxBU_AUTODRAW,
+ const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxButtonNameStr);
public:
wxBrush(void);
- wxBrush(const wxColour& col, const int style);
- wxBrush(const wxString& col, const int style);
+ wxBrush(const wxColour& col, int style);
+ wxBrush(const wxString& col, int style);
wxBrush(const wxBitmap& stipple);
inline wxBrush(const wxBrush& brush) { Ref(brush); }
inline wxBrush(const wxBrush* brush) { /* UnRef(); */ if (brush) Ref(*brush); }
virtual void SetColour(const wxColour& col) ;
virtual void SetColour(const wxString& col) ;
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) ;
inline wxBrush& operator = (const wxBrush& brush) { if (*this == brush) return (*this); Ref(brush); return *this; }
DECLARE_DYNAMIC_CLASS(wxButton)
public:
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 wxSize& size = wxDefaultSize, const long style = 0,
+ const wxSize& size = wxDefaultSize, long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxButtonNameStr)
{
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 wxSize& size = wxDefaultSize, const long style = 0,
+ const wxSize& size = wxDefaultSize, long style = 0,
const wxValidator& validator = wxDefaultValidator,
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 SetLabel(const wxString& label);
virtual wxString GetLabel(void) const ;
virtual void Command(wxCommandEvent& event);
- virtual bool MSWCommand(const WXUINT param, const WXWORD id);
- virtual WXHBRUSH OnCtlColor(const WXHDC pDC, const WXHWND pWnd, const WXUINT nCtlColor,
+ virtual bool MSWCommand(WXUINT param, WXWORD id);
+ virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
};
public:
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 wxSize& size = wxDefaultSize, const long style = 0,
+ const wxSize& size = wxDefaultSize, long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxCheckBoxNameStr)
{
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 wxSize& size = wxDefaultSize, const long style = 0,
+ const wxSize& size = wxDefaultSize, long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxCheckBoxNameStr);
- virtual void SetValue(const bool);
+ virtual void SetValue(bool);
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 bool MSWCommand(const WXUINT param, const WXWORD id);
+ virtual void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
+ virtual bool MSWCommand(WXUINT param, WXWORD id);
virtual void SetLabel(const wxString& label);
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);
};
int checkHeight ;
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 wxSize& size = wxDefaultSize, const long style = 0,
+ const wxSize& size = wxDefaultSize, long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxCheckBoxNameStr)
{
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 wxSize& size = wxDefaultSize, const long style = 0,
+ const wxSize& size = wxDefaultSize, long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxCheckBoxNameStr);
- virtual void SetValue(const bool);
+ virtual void SetValue(bool);
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);
};
#endif
public:
// ctors
wxCheckListBox();
- wxCheckListBox(wxWindow *parent, const wxWindowID id,
+ wxCheckListBox(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
- const int nStrings = 0,
+ int nStrings = 0,
const wxString choices[] = NULL,
- const long style = 0,
+ long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxListBoxNameStr);
// const wxFont& font = wxNullFont);
inline wxChoice(void) { no_strings = 0; }
- inline wxChoice(wxWindow *parent, const wxWindowID id,
+ inline wxChoice(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
- const int n = 0, const wxString choices[] = NULL,
- const long style = 0,
+ int n = 0, const wxString choices[] = NULL,
+ long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxChoiceNameStr)
{
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 wxSize& size = wxDefaultSize,
- const int n = 0, const wxString choices[] = NULL,
- const long style = 0,
+ int n = 0, const wxString choices[] = NULL,
+ long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxChoiceNameStr);
virtual void Append(const wxString& item);
- virtual void Delete(const int n);
+ virtual void Delete(int n);
virtual void Clear(void);
virtual int GetSelection(void) const ;
- virtual void SetSelection(const int n);
+ virtual void SetSelection(int n);
virtual int FindString(const wxString& s) const;
- virtual wxString GetString(const int n) const ;
- virtual void SetSize(const int x, const int y, const int width, const int height, const int sizeFlags = wxSIZE_AUTO);
+ virtual wxString GetString(int n) const ;
+ virtual void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
virtual wxString GetStringSelection(void) const ;
virtual bool SetStringSelection(const wxString& sel);
virtual inline int Number(void) const { return no_strings; }
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 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);
long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
public:
inline wxComboBox(void) {}
- inline wxComboBox(wxWindow *parent, const wxWindowID id,
+ inline wxComboBox(wxWindow *parent, wxWindowID id,
const wxString& value = wxEmptyString,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
- const int n = 0, const wxString choices[] = NULL,
- const long style = 0,
+ int n = 0, const wxString choices[] = NULL,
+ long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxComboBoxNameStr)
{
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 wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
- const int n = 0, const wxString choices[] = NULL,
- const long style = 0,
+ int n = 0, const wxString choices[] = NULL,
+ long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxComboBoxNameStr);
virtual void Copy(void);
virtual void Cut(void);
virtual void Paste(void);
- virtual void SetInsertionPoint(const long pos);
+ virtual void SetInsertionPoint(long pos);
virtual void SetInsertionPointEnd(void);
virtual long GetInsertionPoint(void) const ;
virtual long GetLastPosition(void) const ;
- virtual void Replace(const long from, const long to, const wxString& value);
- virtual void Remove(const long from, const long to);
- virtual void SetSelection(const long from, const long to);
- virtual void SetEditable(const bool editable);
+ virtual void Replace(long from, long to, const wxString& value);
+ virtual void Remove(long from, long to);
+ virtual void SetSelection(long from, long to);
+ virtual void SetEditable(bool editable);
- virtual bool MSWCommand(const WXUINT param, const WXWORD id);
+ virtual bool MSWCommand(WXUINT param, WXWORD id);
};
#endif // USE_COMBOBOX
virtual void Command(wxCommandEvent& WXUNUSED(event)) = 0; // Simulates an event
virtual void ProcessCommand(wxCommandEvent& event); // Calls the callback and
// 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 wxString GetLabel(void) const ;
#endif
// 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
// MSW-specific
// Window procedure
virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
- virtual void MSWOnMouseMove(const int x, const int y, const WXUINT flags);
- virtual bool MSWNotify(const WXWPARAM wParam, const WXLPARAM lParam);
+ virtual void MSWOnMouseMove(int x, int y, WXUINT flags);
+ virtual bool MSWNotify(WXWPARAM wParam, WXLPARAM lParam);
void OnEraseBackground(wxEraseEvent& event);
inline wxCursor(const wxCursor& 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);
- wxCursor(const wxString& name, const long flags = wxBITMAP_TYPE_CUR_RESOURCE,
- const int hotSpotX = 0, const int hotSpotY = 0);
- wxCursor(const int cursor_type);
+ wxCursor(const wxString& name, long flags = wxBITMAP_TYPE_CUR_RESOURCE,
+ int hotSpotX = 0, int hotSpotY = 0);
+ wxCursor(int cursor_type);
~wxCursor(void);
virtual bool Ok(void) const { return (m_refData != NULL && M_CURSORDATA->m_hCursor) ; }
DECLARE_CLASS(wxPrinterDC)
// 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(void);
// Constructor with a modal flag, but no window id - the old convention
inline wxDialog(wxWindow *parent,
const wxString& title, bool modal,
- const int x = -1, const int y= -1, const int width = 500, const int height = 500,
- const long style = wxDEFAULT_DIALOG_STYLE,
+ int x = -1, int y= -1, int width = 500, int height = 500,
+ long style = wxDEFAULT_DIALOG_STYLE,
const wxString& name = wxDialogNameStr)
{
long modalStyle = modal ? wxDIALOG_MODAL : wxDIALOG_MODELESS ;
}
// 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 wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
- const long style = wxDEFAULT_DIALOG_STYLE,
+ long style = wxDEFAULT_DIALOG_STYLE,
const wxString& name = wxDialogNameStr)
{
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 wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
- const long style = wxDEFAULT_DIALOG_STYLE,
+ long style = wxDEFAULT_DIALOG_STYLE,
const wxString& name = wxDialogNameStr);
~wxDialog(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 SetClientSize(const int width, const int height);
+ void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
+ void SetClientSize(int width, int height);
void GetPosition(int *x, int *y) const;
- bool Show(const bool show);
+ bool Show(bool show);
bool IsShown(void) const ;
- void Iconize(const bool iconize);
+ void Iconize(bool iconize);
#if WXWIN_COMPATIBILITY
inline bool Iconized(void) const { return IsIconized(); };
void OnPaint(wxPaintEvent& 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); }
// For now, same as Show(TRUE) but returns return code
// virtual bool MSWOnEraseBkgnd(WXHDC pDC);
virtual bool MSWOnClose(void);
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);
DECLARE_EVENT_TABLE()
// An extended version of wxFileSelector
char* WXDLLEXPORT wxFileSelectorEx(const char *message = wxFileSelectorPromptStr, const char *default_path = NULL,
const char *default_filename = NULL, int *indexDefaultExtension = NULL,
- const char *wildcard = wxFileSelectorDefaultWildcardStr, const int flags = 0,
- wxWindow *parent = NULL, const int x = -1, const int y = -1);
+ const char *wildcard = wxFileSelectorDefaultWildcardStr, int flags = 0,
+ wxWindow *parent = NULL, int x = -1, int y = -1);
// Generic file load dialog
char* WXDLLEXPORT wxLoadFileSelector(const char *what, const char *extension, const char *default_name = NULL, wxWindow *parent = NULL);
wxString GetWeightString(void) const ;
inline bool GetUnderlined(void) const { return M_FONTDATA->m_underlined; }
- void SetPointSize(const int pointSize);
- void SetFamily(const int family);
- void SetStyle(const int style);
- void SetWeight(const int weight);
+ void SetPointSize(int pointSize);
+ void SetFamily(int family);
+ void SetStyle(int style);
+ void SetWeight(int weight);
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 bool operator == (const wxFont& font) { return m_refData == font.m_refData; }
public:
wxFrame(void);
inline wxFrame(wxWindow *parent,
- const wxWindowID id,
+ wxWindowID id,
const wxString& title,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
- const long style = wxDEFAULT_FRAME_STYLE,
+ long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = wxFrameNameStr)
{
Create(parent, id, title, pos, size, style, name);
~wxFrame(void);
bool Create(wxWindow *parent,
- const wxWindowID id,
+ wxWindowID id,
const wxString& title,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
- const long style = wxDEFAULT_FRAME_STYLE,
+ long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = wxFrameNameStr);
#if WXWIN_COMPATIBILITY
+/*
// The default thing is to set the focus for the first child window.
// Override for your own behaviour.
virtual void OldOnActivate(bool flag);
inline virtual void OldOnMenuCommand(int WXUNUSED(id)) {}; // Called on frame menu command
void OldOnSize(int x, int y);
+*/
#endif
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 GetSize(int *width, int *height) 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 OnMenuHighlight(wxMenuEvent& event);
void OnIdle(wxIdleEvent& event);
void OnCloseWindow(wxCloseEvent& event);
- bool Show(const bool show);
+ bool Show(bool show);
// Set menu bar
void SetMenuBar(wxMenuBar *menu_bar);
void SetTitle(const wxString& title);
wxString GetTitle(void) const ;
- void Centre(const int direction = wxBOTH);
+ void Centre(int direction = wxBOTH);
// Call this to simulate a menu command
virtual void Command(int id);
virtual void SetIcon(const wxIcon& icon);
// Create status line
- virtual bool CreateStatusBar(const int number=1);
+ virtual bool CreateStatusBar(int number=1);
inline wxStatusBar *GetStatusBar() const { return m_frameStatusBar; }
// 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
- 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
// TODO: should this go into a wxFrameworkSettings class perhaps?
virtual void Fit(void);
// Iconize
- virtual void Iconize(const bool iconize);
+ virtual void Iconize(bool iconize);
virtual bool IsIconized(void) const ;
// Compatibility
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 void PositionStatusBar(void);
- virtual wxStatusBar *OnCreateStatusBar(const int number);
+ virtual wxStatusBar *OnCreateStatusBar(int number);
// Query app for menu item updates (called from OnIdle)
void DoMenuUpdates(void);
// Handlers
bool MSWOnPaint(void);
WXHICON MSWOnQueryDragIcon(void);
- void MSWOnSize(const int x, const int y, const WXUINT flag);
- bool MSWOnCommand(const WXWORD id, const WXWORD cmd, const WXHWND control);
+ void MSWOnSize(int x, int y, WXUINT flag);
+ bool MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND control);
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);
- void MSWCreate(const 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);
+ void MSWCreate(int id, wxWindow *parent, const char *WXUNUSED(wclass), wxWindow *wx_win, const char *title,
+ int x, int y, int width, int height, long style);
protected:
wxMenuBar * m_frameMenuBar;
public:
inline wxGauge95(void) { m_rangeMax = 0; m_gaugePos = 0; }
- inline wxGauge95(wxWindow *parent, const wxWindowID id,
- const int range,
+ inline wxGauge95(wxWindow *parent, wxWindowID id,
+ int range,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
- const long style = wxGA_HORIZONTAL,
+ long style = wxGA_HORIZONTAL,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxGaugeNameStr)
{
Create(parent, id, range, pos, size, style, validator, name);
}
- bool Create(wxWindow *parent, const wxWindowID id,
- const int range,
+ bool Create(wxWindow *parent, wxWindowID id,
+ int range,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
- const long style = wxGA_HORIZONTAL,
+ long style = wxGA_HORIZONTAL,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxGaugeNameStr);
- void SetShadowWidth(const int w);
- void SetBezelFace(const int w);
- void SetRange(const int r);
- void SetValue(const int pos);
+ void SetShadowWidth(int w);
+ void SetBezelFace(int w);
+ void SetRange(int r);
+ void SetValue(int pos);
int GetShadowWidth(void) const ;
int GetBezelFace(void) const ;
inline void SetButtonColour(const wxColour& col) { SetForegroundColour(col); }
#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)) {} ;
public:
inline wxGaugeMSW(void) { m_rangeMax = 0; m_gaugePos = 0; }
- inline wxGaugeMSW(wxWindow *parent, const wxWindowID id,
- const int range,
+ inline wxGaugeMSW(wxWindow *parent, wxWindowID id,
+ int range,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
- const long style = wxGA_HORIZONTAL,
+ long style = wxGA_HORIZONTAL,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxGaugeNameStr)
{
Create(parent, id, range, pos, size, style, validator, name);
}
- bool Create(wxWindow *parent, const wxWindowID id,
- const int range,
+ bool Create(wxWindow *parent, wxWindowID id,
+ int range,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
- const long style = wxGA_HORIZONTAL,
+ long style = wxGA_HORIZONTAL,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxGaugeNameStr);
- void SetShadowWidth(const int w);
- void SetBezelFace(const int w);
- void SetRange(const int r);
- void SetValue(const int pos);
+ void SetShadowWidth(int w);
+ void SetBezelFace(int w);
+ void SetRange(int r);
+ void SetValue(int pos);
int GetShadowWidth(void) const ;
int GetBezelFace(void) const ;
inline void SetButtonColour(const wxColour& col) { SetForegroundColour(col); }
#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)) {} ;
inline wxIcon(const wxIcon& 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 wxString& name, const long flags = wxBITMAP_TYPE_ICO_RESOURCE,
+ wxIcon(const char bits[], int width, int height);
+ wxIcon(const wxString& name, long flags = wxBITMAP_TYPE_ICO_RESOURCE,
int desiredWidth = -1, int desiredHeight = -1);
~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);
inline wxIcon& operator = (const wxIcon& icon) { if (*this == icon) return (*this); Ref(icon); return *this; }
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);
};
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);
};
// Specify the width and height of the images in the list,
// whether there are masks associated with them (e.g. if creating images
// 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);
}
// width, height specify the size of the images in the list (all the same).
// mask specifies whether the images have masks or not.
// 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.
// Note that wxImageList creates *new* bitmaps, so you may delete
// Replaces a bitmap, optionally passing a mask bitmap.
// Note that wxImageList creates new bitmaps, so you may delete
// '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
// Replacing a bitmap, using the specified colour to create the mask bitmap
// Note that wxImageList creates new bitmaps, so you may delete
// '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.
// 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.
- bool Remove(const int index);
+ bool Remove(int index);
// Remove all images
bool RemoveAll(void);
// If 'solidBackground' is TRUE, Draw sets the image list background
// colour to the background colour of the wxDC, to speed up
// drawing by eliminating masked drawing where possible.
- bool Draw(const int index, wxDC& dc, const int x, const int y,
- const int flags = wxIMAGELIST_DRAW_NORMAL, const bool solidBackground = FALSE);
+ bool Draw(int index, wxDC& dc, int x, int y,
+ int flags = wxIMAGELIST_DRAW_NORMAL, bool solidBackground = FALSE);
// TODO: miscellaneous functionality
/*
- wxIcon *MakeIcon(const int index);
- bool SetOverlayImage(const int index, const int overlayMask);
+ wxIcon *MakeIcon(int index);
+ bool SetOverlayImage(int index, int overlayMask);
*/
#if 0
// Creates a new drag image by combining the given image (typically a mouse cursor 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;
// otherwise, NULL.
// 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
// member function.
- bool BeginDrag(const int index, const wxPoint& hotSpot);
+ bool BeginDrag(int index, const wxPoint& hotSpot);
// Ends a drag operation.
bool EndDrag(void);
public:
wxListBox(void);
- inline wxListBox(wxWindow *parent, const wxWindowID id,
+ inline wxListBox(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
- const int n = 0, const wxString choices[] = NULL,
- const long style = 0,
+ int n = 0, const wxString choices[] = NULL,
+ long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxListBoxNameStr)
{
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 wxSize& size = wxDefaultSize,
- const int n = 0, const wxString choices[] = NULL,
- const long style = 0,
+ int n = 0, const wxString choices[] = NULL,
+ long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxListBoxNameStr);
~wxListBox();
- bool MSWCommand(const WXUINT param, const WXWORD id);
+ bool MSWCommand(WXUINT param, WXWORD id);
#if USE_OWNER_DRAWN
bool MSWOnMeasure(WXMEASUREITEMSTRUCT *item);
virtual void Append(const wxString& item);
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 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
virtual int GetSelection() const ;
- virtual void Delete(const int n);
- virtual char *GetClientData(const int n) const ;
- virtual void SetClientData(const int n, char *clientData);
- virtual void SetString(const int n, const wxString& s);
+ virtual void Delete(int n);
+ virtual char *GetClientData(int n) const ;
+ virtual void SetClientData(int n, char *clientData);
+ virtual void SetString(int n, const wxString& s);
// For single or multiple choice list item
virtual int GetSelections(wxArrayInt& aSelections) const;
- virtual bool Selected(const int n) const ;
- virtual wxString GetString(const int n) const ;
- virtual void SetSize(const int x, const int y, const int width, const int height, const int sizeFlags = wxSIZE_AUTO);
+ virtual bool Selected(int n) const ;
+ virtual wxString GetString(int n) const ;
+ virtual void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
// Set the specified item at the first visible item
// or scroll to max range.
- virtual void SetFirstItem(const int n) ;
+ virtual void SetFirstItem(int n) ;
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 bool SetStringSelection(const wxString& s, const bool flag = TRUE);
+ virtual bool SetStringSelection(const wxString& s, bool flag = TRUE);
virtual int Number(void) const ;
void Command(wxCommandEvent& event);
// Otherwise, all strings are used.
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);
virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
};
// 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);
class WXDLLEXPORT wxListCtrl: public wxControl
{
wxListCtrl(void);
- inline wxListCtrl(wxWindow *parent, const wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
- const long style = wxLC_ICON, const wxValidator& validator = wxDefaultValidator,
+ inline wxListCtrl(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
+ long style = wxLC_ICON, const wxValidator& validator = wxDefaultValidator,
const wxString& name = "listCtrl")
{
Create(parent, id, pos, size, style, validator, name);
}
~wxListCtrl(void);
- bool Create(wxWindow *parent, const wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
- const long style = wxLC_ICON, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxListCtrl");
+ bool Create(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
+ long style = wxLC_ICON, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxListCtrl");
// Attributes
void SetBackgroundColour(const wxColour& col);
// Gets information about this column
- bool GetColumn(const int col, wxListItem& item) const;
+ bool GetColumn(int col, wxListItem& item) const;
// Sets information about this column
- bool SetColumn(const int col, wxListItem& item) ;
+ bool SetColumn(int col, wxListItem& item) ;
// Gets the column width
- int GetColumnWidth(const int col) const;
+ int GetColumnWidth(int col) const;
// Sets the column width
- bool SetColumnWidth(const int col, const int width) ;
+ bool SetColumnWidth(int col, int width) ;
// Gets the number of items that can fit vertically in the
// visible area of the list control (list or report view)
bool SetItem(wxListItem& info) ;
// Sets a string field at a particular column
- 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);
// Gets the item state
- int GetItemState(const long item, const long stateMask) const ;
+ int GetItemState(long item, long stateMask) const ;
// Sets the item state
- bool SetItemState(const long item, const long state, const long stateMask) ;
+ bool SetItemState(long item, long state, long stateMask) ;
// Sets the item image
- bool SetItemImage(const long item, const int image, const int selImage) ;
+ bool SetItemImage(long item, int image, int selImage) ;
// Gets the item text
- wxString GetItemText(const long item) const ;
+ wxString GetItemText(long item) const ;
// Sets the item text
- void SetItemText(const long item, const wxString& str) ;
+ void SetItemText(long item, const wxString& str) ;
// Gets the item data
- long GetItemData(const long item) const ;
+ long GetItemData(long item) const ;
// Sets the item data
- bool SetItemData(const long item, long data) ;
+ bool SetItemData(long item, long data) ;
// Gets the item rectangle
- bool GetItemRect(const long item, wxRectangle& rect, const int code = wxLIST_RECT_BOUNDS) const ;
+ bool GetItemRect(long item, wxRectangle& rect, int code = wxLIST_RECT_BOUNDS) const ;
// Gets the item position
- bool GetItemPosition(const long item, wxPoint& pos) const ;
+ bool GetItemPosition(long item, wxPoint& pos) const ;
// Sets the item position
- bool SetItemPosition(const long item, const wxPoint& pos) ;
+ bool SetItemPosition(long item, const wxPoint& pos) ;
// Gets the number of items in the list control
int GetItemCount(void) const;
long GetTopItem(void) const ;
// Add or remove a single window style
- void SetSingleStyle(const long style, const bool add = TRUE) ;
+ void SetSingleStyle(long style, bool add = TRUE) ;
// Set the whole window style
- void SetWindowStyleFlag(const long style) ;
+ void SetWindowStyleFlag(long style) ;
// Searches for an item, starting from 'item'.
// item can be -1 to find the first item that matches the
// specified flags.
// Returns the item or -1 if unsuccessful.
- long GetNextItem(const long item, int geometry = wxLIST_NEXT_ALL, int state = wxLIST_STATE_DONTCARE) const ;
+ long GetNextItem(long item, int geometry = wxLIST_NEXT_ALL, int state = wxLIST_STATE_DONTCARE) const ;
// Implementation: converts wxWindows style to MSW style.
// Can be a single style flag or a bit list.
// oldStyle is 'normalised' so that it doesn't contain
// conflicting styles.
- long ConvertToMSWStyle(long& oldStyle, const long style) const;
+ long ConvertToMSWStyle(long& oldStyle, long style) const;
// Gets one of the three image lists
- wxImageList *GetImageList(const int which) const ;
+ wxImageList *GetImageList(int which) const ;
// Sets the image list
// N.B. There's a quirk in the Win95 list view implementation.
// haven't specified wxLIST_MASK_IMAGE when inserting.
// So you have to set a NULL small-icon image list to be sure that
// the wxLC_LIST mode works without icons. Of course, you may want icons...
- void SetImageList(wxImageList *imageList, const int which) ;
+ void SetImageList(wxImageList *imageList, int which) ;
// Operations
////////////////////////////////////////////////////////////////////////////
// Arranges the items
- bool Arrange(const int flag = wxLIST_ALIGN_DEFAULT);
+ bool Arrange(int flag = wxLIST_ALIGN_DEFAULT);
// Deletes an item
- bool DeleteItem(const long item);
+ bool DeleteItem(long item);
// Deletes all items
bool DeleteAllItems(void) ;
// Deletes a column
- bool DeleteColumn(const int col);
+ bool DeleteColumn(int col);
// Deletes all columns
bool DeleteAllColumns(void);
void ClearAll(void);
// Edits a label
- wxTextCtrl& Edit(const long item) ;
+ wxTextCtrl& Edit(long item) ;
// Ensures this item is visible
- bool EnsureVisible(const long item) ;
+ bool EnsureVisible(long item) ;
// Find an item whose label matches this string, starting from the item after 'start'
// or the beginning if 'start' is -1.
- long FindItem(const long start, const wxString& str, const bool partial = FALSE);
+ long FindItem(long start, const wxString& str, bool partial = FALSE);
// Find an item whose data matches this data, starting from the item after 'start'
// or the beginning if 'start' is -1.
- long FindItem(const long start, const long data);
+ long FindItem(long start, long data);
// Find an item nearest this position in the specified direction, starting from
// the item after 'start' or the beginning if 'start' is -1.
- long FindItem(const long start, const wxPoint& pt, const int direction);
+ long FindItem(long start, const wxPoint& pt, int direction);
// Determines which item (if any) is at the specified point,
// giving details in 'flags' (see wxLIST_HITTEST_... flags above)
long InsertItem(wxListItem& info);
// Insert a string item
- long InsertItem(const long index, const wxString& label);
+ long InsertItem(long index, const wxString& label);
// Insert an image item
- long InsertItem(const long index, const int imageIndex);
+ long InsertItem(long index, int imageIndex);
// Insert an image/string item
- long InsertItem(const long index, const wxString& label, const int imageIndex);
+ long InsertItem(long index, const wxString& label, int imageIndex);
// For list view mode (only), inserts a column.
- 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,
- const int width = -1);
+ long InsertColumn(long col, const wxString& heading, int format = wxLIST_FORMAT_LEFT,
+ int width = -1);
// Scrolls the list control. If in icon, small icon or report view mode,
// x specifies the number of pixels to scroll. If in list view mode, x
// specifies the number of columns to scroll.
// If in icon, small icon or list view mode, y specifies the number of pixels
// to scroll. If in report view mode, y specifies the number of lines to scroll.
- bool ScrollList(const int dx, const int dy);
+ bool ScrollList(int dx, int dy);
// Sort items.
* but the display needs refreshing (in string callback mode)
// Updates an item. If the list control has the wxLI_AUTO_ARRANGE style,
// the items will be rearranged.
- bool Update(const long item);
+ bool Update(long item);
*/
void Command(wxCommandEvent& event) { ProcessCommand(event); };
// IMPLEMENTATION
- bool MSWCommand(const WXUINT param, const WXWORD id);
- bool MSWNotify(const WXWPARAM wParam, const WXLPARAM lParam);
+ bool MSWCommand(WXUINT param, WXWORD id);
+ bool MSWNotify(WXWPARAM wParam, WXLPARAM lParam);
// Recreate window - seems to be necessary when changing a style.
void RecreateWindow(void);
wxMDIParentFrame(void);
inline wxMDIParentFrame(wxWindow *parent,
- const wxWindowID id,
+ wxWindowID id,
const wxString& title,
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)
{
Create(parent, id, title, pos, size, style, name);
~wxMDIParentFrame(void);
bool Create(wxWindow *parent,
- const wxWindowID id,
+ wxWindowID id,
const wxString& title,
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);
+/*
#if WXWIN_COMPATIBILITY
virtual void OldOnActivate(bool flag);
virtual void OldOnSize(int x, int y);
#endif
+*/
void OnSize(wxSizeEvent& event);
void OnActivate(wxActivateEvent& event);
virtual void ActivatePrevious(void);
// Handlers
- void MSWOnSize(const int x, const int y, const WXUINT flag);
- bool MSWOnCommand(const WXWORD id, const WXWORD cmd, const WXHWND control);
- void MSWOnMenuHighlight(const WXWORD item, const WXWORD flags, const WXHMENU sysmenu);
+ void MSWOnSize(int x, int y, WXUINT flag);
+ bool MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND control);
+ void MSWOnMenuHighlight(WXWORD item, WXWORD flags, WXHMENU sysmenu);
bool MSWProcessMessage(WXMSG *msg);
void MSWOnCreate(WXLPCREATESTRUCT cs);
long MSWDefWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
- bool MSWOnEraseBkgnd(const WXHDC pDC);
+ bool MSWOnEraseBkgnd(WXHDC pDC);
bool MSWOnDestroy(void);
- bool MSWOnActivate(const int state, const bool minimized, const WXHWND activate);
+ bool MSWOnActivate(int state, bool minimized, WXHWND activate);
// Responds to colour changes
void OnSysColourChanged(wxSysColourChangedEvent& event);
wxMDIChildFrame(void);
inline wxMDIChildFrame(wxMDIParentFrame *parent,
- const wxWindowID id,
+ wxWindowID id,
const wxString& title,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
- const long style = wxDEFAULT_FRAME_STYLE,
+ long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = wxFrameNameStr)
{
Create(parent, id, title, pos, size, style, name);
~wxMDIChildFrame(void);
bool Create(wxMDIParentFrame *parent,
- const wxWindowID id,
+ wxWindowID id,
const wxString& title,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
- const long style = wxDEFAULT_FRAME_STYLE,
+ long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = wxFrameNameStr);
// Set menu bar
void SetMenuBar(wxMenuBar *menu_bar);
- void SetClientSize(const int width, const int height);
+ void SetClientSize(int width, int height);
void GetPosition(int *x, int *y) const ;
// MDI operations
// Handlers
- long MSWOnMDIActivate(const long bActivate, const WXHWND, const WXHWND);
- void MSWOnSize(const int x, const int y, const WXUINT);
+ long MSWOnMDIActivate(long bActivate, WXHWND, WXHWND);
+ void MSWOnSize(int x, int y, WXUINT);
void MSWOnWindowPosChanging(void *lpPos);
- bool MSWOnCommand(const WXWORD id, const WXWORD cmd, const WXHWND control);
+ bool MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND control);
long MSWDefWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
bool MSWProcessMessage(WXMSG *msg);
void MSWDestroyWindow(void);
public:
wxMDIClientWindow(void) ;
- inline wxMDIClientWindow(wxMDIParentFrame *parent, const long style = 0)
+ inline wxMDIClientWindow(wxMDIParentFrame *parent, long style = 0)
{
CreateClient(parent, style);
}
~wxMDIClientWindow(void);
// Note: this is virtual, to allow overridden behaviour.
- virtual bool CreateClient(wxMDIParentFrame *parent, const long style = wxVSCROLL | wxHSCROLL);
+ virtual bool CreateClient(wxMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL);
// Explicitly call default scroll behaviour
void OnScroll(wxScrollEvent& event);
virtual long MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
// Should hand the message to the default proc
- long MSWOnMDIActivate(const long bActivate, const WXHWND, const WXHWND);
+ long MSWOnMDIActivate(long bActivate, WXHWND, WXHWND);
protected:
int m_scrollX;
void SetLabel(int id, const wxString& label);
wxString GetLabel(int id) const;
// help string
- virtual void SetHelpString(const int id, const wxString& helpString);
- virtual wxString GetHelpString(const int id) const ;
+ virtual void SetHelpString(int id, const wxString& helpString);
+ virtual wxString GetHelpString(int id) const ;
// find item
// Finds the item id matching the given string, NOT_FOUND if not found.
virtual int FindItem(const wxString& itemString) const ;
// Find wxMenuItem by ID, and item's menu too if itemMenu is !NULL.
- wxMenuItem *FindItemForId(const int itemId, wxMenu **itemMenu = NULL) const;
+ wxMenuItem *FindItemForId(int itemId, wxMenu **itemMenu = NULL) const;
void ProcessCommand(wxCommandEvent& event);
inline void Callback(const wxFunction func) { m_callback = func; }
inline wxEvtHandler *GetEventHandler(void) { return m_eventHandler; }
// IMPLEMENTATION
- bool MSWCommand(const WXUINT param, const WXWORD id);
+ bool MSWCommand(WXUINT param, WXWORD id);
void SetInvokingWindow(wxWindow *pWin) { m_pInvokingWindow = pWin; }
wxWindow *GetInvokingWindow() const { return m_pInvokingWindow; }
DECLARE_DYNAMIC_CLASS(wxMenuBar)
wxMenuBar(void);
- wxMenuBar(const int n, wxMenu *menus[], const wxString titles[]);
+ wxMenuBar(int n, wxMenu *menus[], const wxString titles[]);
~wxMenuBar(void);
void Append(wxMenu *menu, const wxString& title);
// Must only be used AFTER menu has been attached to frame,
// otherwise use individual menus to enable/disable items
- void Enable(const int Id, const bool Flag);
- bool Enabled(const int Id) const ;
- inline bool IsEnabled(const int Id) const { return Enabled(Id); };
- void EnableTop(const int pos, const bool Flag);
- void Check(const int id, const bool Flag);
- bool Checked(const int id) const ;
- inline bool IsChecked(const int Id) const { return Checked(Id); };
- void SetLabel(const int id, const wxString& label) ;
- wxString GetLabel(const int id) const ;
- void SetLabelTop(const int pos, const wxString& label) ;
- wxString GetLabelTop(const int pos) const ;
- virtual void Delete(wxMenu *menu, const int index = 0); /* Menu not destroyed */
+ void Enable(int Id, bool Flag);
+ bool Enabled(int Id) const ;
+ inline bool IsEnabled(int Id) const { return Enabled(Id); };
+ void EnableTop(int pos, bool Flag);
+ void Check(int id, bool Flag);
+ bool Checked(int id) const ;
+ inline bool IsChecked(int Id) const { return Checked(Id); };
+ void SetLabel(int id, const wxString& label) ;
+ wxString GetLabel(int id) const ;
+ void SetLabelTop(int pos, const wxString& label) ;
+ wxString GetLabelTop(int pos) const ;
+ virtual void Delete(wxMenu *menu, int index = 0); /* Menu not destroyed */
virtual bool OnAppend(wxMenu *menu, const char *title);
- virtual bool OnDelete(wxMenu *menu, const int index);
+ virtual bool OnDelete(wxMenu *menu, int index);
- virtual void SetHelpString(const int Id, const wxString& helpString);
- virtual wxString GetHelpString(const int Id) const ;
+ virtual void SetHelpString(int Id, const wxString& helpString);
+ virtual wxString GetHelpString(int Id) const ;
virtual int FindMenuItem(const wxString& menuString, const wxString& itemString) const ;
// Find wxMenuItem for item ID, and return item's
// menu too if itemMenu is non-NULL.
- wxMenuItem *FindItemForId(const int itemId, wxMenu **menuForItem = NULL) const ;
+ wxMenuItem *FindItemForId(int itemId, wxMenu **menuForItem = NULL) const ;
inline void SetEventHandler(wxEvtHandler *handler) { m_eventHandler = handler; }
inline wxEvtHandler *GetEventHandler(void) { return m_eventHandler; }
public:
inline wxMiniFrame(void) {}
inline wxMiniFrame(wxWindow *parent,
- const wxWindowID id,
+ wxWindowID id,
const wxString& title,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
- const long style = wxDEFAULT_FRAME|wxTINY_CAPTION_HORIZ,
+ long style = wxDEFAULT_FRAME|wxTINY_CAPTION_HORIZ,
const wxString& name = wxFrameNameStr)
{
Create(parent, id, title, pos, size, style, name);
int WXDLLEXPORT 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
// __MSGBOXDLGH__
wxNotebook();
// the same arguments as for wxControl (@@@ any special styles?)
wxNotebook(wxWindow *parent,
- const wxWindowID id,
+ wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
- const long style = 0,
+ long style = 0,
const wxString& name = "notebook");
// Create() function
bool Create(wxWindow *parent,
- const wxWindowID id,
+ wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
- const long style = 0,
+ long style = 0,
const wxString& name = "notebook");
// dtor
~wxNotebook();
// base class virtuals
// -------------------
virtual void Command(wxCommandEvent& event);
- virtual bool MSWNotify(const WXWPARAM wParam, const WXLPARAM lParam);
+ virtual bool MSWNotify(WXWPARAM wParam, WXLPARAM lParam);
protected:
// common part of all ctors
inline wxPalette(const wxPalette& palette) { Ref(palette); }
inline wxPalette(const wxPalette* palette) { /* UnRef(); */ if (palette) Ref(*palette); }
- 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(void);
- 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;
- 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;
virtual bool Ok(void) const { return (m_refData != NULL) ; }
DECLARE_DYNAMIC_CLASS(wxPen)
public:
wxPen(void);
- wxPen(const wxColour& col, const int width, const int style);
- wxPen(const wxString& col, const int width, const int style);
- wxPen(const wxBitmap& stipple, const int width);
+ wxPen(const wxColour& col, int width, int style);
+ wxPen(const wxString& col, int width, int style);
+ wxPen(const wxBitmap& stipple, int width);
inline wxPen(const wxPen& pen) { Ref(pen); }
inline wxPen(const wxPen* pen) { /* UnRef(); */ if (pen) Ref(*pen); }
~wxPen(void);
void SetColour(const wxString& col) ;
void SetColour(const unsigned char r, const unsigned char g, const unsigned char b) ;
- void SetWidth(const int width) ;
- void SetStyle(const int style) ;
+ void SetWidth(int width) ;
+ void SetStyle(int style) ;
void SetStipple(const wxBitmap& stipple) ;
- void SetDashes(const int nb_dashes, const wxDash *dash) ;
- void SetJoin(const int join) ;
- void SetCap(const int cap) ;
+ void SetDashes(int nb_dashes, const wxDash *dash) ;
+ void SetJoin(int join) ;
+ void SetCap(int cap) ;
inline wxColour& GetColour(void) const { return (M_PENDATA ? M_PENDATA->m_colour : wxNullColour); };
inline int GetWidth(void) const { return (M_PENDATA ? M_PENDATA->m_width : 0); };
m_type = wxBITMAP_TYPE_PNG;
};
- 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);
- 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);
};
#endif
- inline wxRadioBox(wxWindow *parent, const wxWindowID id, const wxString& title,
+ inline wxRadioBox(wxWindow *parent, wxWindowID id, const wxString& title,
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
- const int n = 0, const wxString choices[] = NULL,
- const int majorDim = 0, const long style = wxRA_HORIZONTAL,
+ int n = 0, const wxString choices[] = NULL,
+ int majorDim = 0, long style = wxRA_HORIZONTAL,
const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr)
{
Create(parent, id, title, pos, size, n, choices, majorDim, style, val, name);
}
/*
- 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 int n = 0, const wxBitmap *choices[] = NULL,
- const int majorDim = 0, const long style = wxRA_HORIZONTAL,
+ int n = 0, const wxBitmap *choices[] = NULL,
+ int majorDim = 0, long style = wxRA_HORIZONTAL,
const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr)
{
Create(parent, id, title, pos, size, n, choices, majorDim, style, val, name);
~wxRadioBox(void);
- 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 int n = 0, const wxString choices[] = NULL,
- const int majorDim = 0, const long style = wxRA_HORIZONTAL,
+ int n = 0, const wxString choices[] = NULL,
+ int majorDim = 0, long style = wxRA_HORIZONTAL,
const wxValidator& val = wxDefaultValidator, 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 int n = 0, const wxBitmap *choices[] = NULL,
- const int majorDim = 0, const long style = wxRA_HORIZONTAL,
+ int n = 0, const wxBitmap *choices[] = NULL,
+ int majorDim = 0, long style = wxRA_HORIZONTAL,
const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr);
*/
- virtual bool MSWCommand(const WXUINT param, const WXWORD id);
- virtual WXHBRUSH OnCtlColor(const WXHDC pDC, const WXHWND pWnd, const WXUINT nCtlColor,
+ virtual bool MSWCommand(WXUINT param, WXWORD id);
+ virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
int FindString(const wxString& s) const;
- void SetSelection(const int N);
+ void SetSelection(int N);
int GetSelection(void) const;
- wxString GetString(const int N) const;
- void SetSize(const int x, const int y, const int width, const int height, const int sizeFlags = wxSIZE_AUTO);
+ wxString GetString(int N) const;
+ void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
void GetSize(int *x, int *y) const;
void GetPosition(int *x, int *y) const;
wxString GetLabel(void) const;
void SetLabel(const wxString& label);
- void SetLabel(const int item, const wxString& label) ;
- void SetLabel(const int item, wxBitmap *bitmap) ;
- wxString GetLabel(const int item) const;
- bool Show(const bool show);
+ void SetLabel(int item, const wxString& label) ;
+ void SetLabel(int item, wxBitmap *bitmap) ;
+ wxString GetLabel(int item) const;
+ bool Show(bool show);
void SetFocus(void);
- void Enable(const bool enable);
- void Enable(const int item, const bool enable);
- void Show(const int item, const bool show) ;
+ void Enable(bool enable);
+ void Enable(int item, bool enable);
+ void Show(int item, bool show) ;
inline void SetLabelFont(const wxFont& WXUNUSED(font)) {};
inline void SetButtonFont(const wxFont& font) { SetFont(font); }
void Command(wxCommandEvent& event);
inline int GetNumberOfRowsOrCols(void) const { return m_noRowsOrCols; }
- inline void SetNumberOfRowsOrCols(const int n) { m_noRowsOrCols = n; }
+ inline void SetNumberOfRowsOrCols(int n) { m_noRowsOrCols = n; }
// Implementation
inline WXHWND *GetRadioButtons(void) const { return m_radioButtons; }
protected:
public:
inline wxRadioButton(void) {}
- inline wxRadioButton(wxWindow *parent, const wxWindowID id,
+ inline wxRadioButton(wxWindow *parent, wxWindowID id,
const wxString& label,
const wxPoint& pos = wxDefaultPosition,
- const wxSize& size = wxDefaultSize, const long style = 0,
+ const wxSize& size = wxDefaultSize, long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxRadioButtonNameStr)
{
Create(parent, id, label, pos, size, style, validator, name);
}
- bool Create(wxWindow *parent, const wxWindowID id,
+ bool Create(wxWindow *parent, wxWindowID id,
const wxString& label,
const wxPoint& pos = wxDefaultPosition,
- const wxSize& size = wxDefaultSize, const long style = 0,
+ const wxSize& size = wxDefaultSize, long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxRadioButtonNameStr);
virtual void SetLabel(const wxString& label);
- virtual void SetValue(const bool val);
+ virtual void SetValue(bool val);
virtual bool GetValue(void) const ;
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);
};
wxBitmap *theButtonBitmap;
public:
inline wxBitmapRadioButton(void) { theButtonBitmap = NULL; }
- inline wxBitmapRadioButton(wxWindow *parent, const wxWindowID id,
+ inline wxBitmapRadioButton(wxWindow *parent, wxWindowID id,
const wxBitmap *label,
const wxPoint& pos = wxDefaultPosition,
- const wxSize& size = wxDefaultSize, const long style = 0,
+ const wxSize& size = wxDefaultSize, long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxBitmapRadioButtonNameStr)
{
Create(parent, id, label, pos, size, style, validator, name);
}
- bool Create(wxWindow *parent, const wxWindowID id,
+ bool Create(wxWindow *parent, wxWindowID id,
const wxBitmap *label,
const wxPoint& pos = wxDefaultPosition,
- const wxSize& size = wxDefaultSize, const long style = 0,
+ const wxSize& size = wxDefaultSize, long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxBitmapRadioButtonNameStr);
virtual void SetLabel(const wxBitmap *label);
- virtual void SetValue(const bool val) ;
+ virtual void SetValue(bool val) ;
virtual bool GetValue(void) const ;
};
#endif
inline wxScrollBar(void) { m_pageSize = 0; m_viewSize = 0; m_objectSize = 0; }
~wxScrollBar(void);
- inline wxScrollBar(wxWindow *parent, const wxWindowID id,
+ inline wxScrollBar(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
- const long style = wxSB_HORIZONTAL,
+ long style = wxSB_HORIZONTAL,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxScrollBarNameStr)
{
Create(parent, id, pos, size, style, validator, name);
}
- bool Create(wxWindow *parent, const wxWindowID id,
+ bool Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
- const long style = wxSB_HORIZONTAL,
+ long style = wxSB_HORIZONTAL,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxScrollBarNameStr);
inline int GetPageSize() const { return m_viewSize; }
inline int GetRange() const { return m_objectSize; }
- virtual void SetPosition(const int viewStart);
- virtual void SetScrollbar(const int position, const int thumbSize, const int range, const int pageSize,
- const bool refresh = TRUE);
+ virtual void SetPosition(int viewStart);
+ virtual void SetScrollbar(int position, int thumbSize, int range, int pageSize,
+ bool refresh = TRUE);
#if WXWIN_COMPATIBILITY
// Backward compatibility
inline int GetValue(void) const { return GetPosition(); }
- inline void SetValue(const int viewStart) { SetPosition(viewStart); }
+ inline void SetValue(int viewStart) { SetPosition(viewStart); }
void GetValues(int *viewStart, int *viewLength, int *objectLength,
int *pageLength) const ;
inline int GetViewLength() const { return m_viewSize; }
inline int GetObjectLength() const { return m_objectSize; }
- void SetPageSize(const int pageLength);
- void SetObjectLength(const int objectLength);
- void SetViewLength(const int viewLength);
+ void SetPageSize(int pageLength);
+ void SetObjectLength(int objectLength);
+ void SetViewLength(int viewLength);
#endif
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);
- void MSWOnVScroll(const WXWORD wParam, const WXWORD pos, const WXHWND control);
- void MSWOnHScroll(const WXWORD wParam, const WXWORD pos, const WXHWND control);
+ void MSWOnVScroll(WXWORD wParam, WXWORD pos, WXHWND control);
+ void MSWOnHScroll(WXWORD wParam, WXWORD pos, WXHWND control);
#if WXWIN_COMPATIBILITY
// Backward compatibility: generate an old-style scroll command
public:
wxSlider95(void);
- inline wxSlider95(wxWindow *parent, const wxWindowID id,
- const int value, const int minValue, const int maxValue,
+ inline wxSlider95(wxWindow *parent, wxWindowID id,
+ int value, int minValue, int maxValue,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
- const long style = wxSL_HORIZONTAL,
+ long style = wxSL_HORIZONTAL,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxSliderNameStr)
{
~wxSlider95(void);
- bool Create(wxWindow *parent, const wxWindowID id,
- const int value, const int minValue, const int maxValue,
+ bool Create(wxWindow *parent, wxWindowID id,
+ int value, int minValue, int maxValue,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
- const long style = wxSL_HORIZONTAL,
+ long style = wxSL_HORIZONTAL,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxSliderNameStr);
virtual int GetValue(void) const ;
- virtual void SetValue(const int);
+ virtual void SetValue(int);
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 ;
- bool Show(const bool show);
+ bool Show(bool show);
- void SetRange(const int minValue, const int maxValue);
+ void SetRange(int minValue, int maxValue);
inline int GetMin(void) const { return m_rangeMin; }
inline int GetMax(void) const { return m_rangeMax; }
// For trackbars only
- void SetTickFreq(const int n, const int pos);
+ void SetTickFreq(int n, int pos);
inline int GetTickFreq(void) const { return m_tickFreq; }
- void SetPageSize(const int pageSize);
+ void SetPageSize(int pageSize);
int GetPageSize(void) const ;
void ClearSel(void) ;
void ClearTicks(void) ;
- void SetLineSize(const int lineSize);
+ void SetLineSize(int lineSize);
int GetLineSize(void) const ;
int GetSelEnd(void) const ;
int GetSelStart(void) const ;
- void SetSelection(const int minPos, const int maxPos);
- void SetThumbLength(const int len) ;
+ void SetSelection(int minPos, int maxPos);
+ void SetThumbLength(int len) ;
int GetThumbLength(void) const ;
- void SetTick(const int tickPos) ;
+ void SetTick(int tickPos) ;
// IMPLEMENTATION
inline WXHWND GetStaticMin() const { return m_staticMin; }
#endif
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);
- void MSWOnVScroll(const WXWORD wParam, const WXWORD pos, const WXHWND control);
- void MSWOnHScroll(const WXWORD wParam, const WXWORD pos, const WXHWND control);
+ void MSWOnVScroll(WXWORD wParam, WXWORD pos, WXHWND control);
+ void MSWOnHScroll(WXWORD wParam, WXWORD pos, WXHWND control);
protected:
WXHWND m_staticMin;
public:
wxSliderMSW(void);
- inline wxSliderMSW(wxWindow *parent, const wxWindowID id,
- const int value, const int minValue, const int maxValue,
+ inline wxSliderMSW(wxWindow *parent, wxWindowID id,
+ int value, int minValue, int maxValue,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
- const long style = wxSL_HORIZONTAL,
+ long style = wxSL_HORIZONTAL,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxSliderNameStr)
{
~wxSliderMSW(void);
- bool Create(wxWindow *parent, const wxWindowID id,
- const int value, const int minValue, const int maxValue,
+ bool Create(wxWindow *parent, wxWindowID id,
+ int value, int minValue, int maxValue,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
- const long style = wxSL_HORIZONTAL,
+ long style = wxSL_HORIZONTAL,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxSliderNameStr);
virtual int GetValue(void) const ;
- virtual void SetValue(const int);
+ virtual void SetValue(int);
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 ;
- bool Show(const bool show);
+ bool Show(bool show);
- void SetRange(const int minValue, const int maxValue);
+ void SetRange(int minValue, int maxValue);
inline int GetMin(void) const { return m_rangeMin; }
inline int GetMax(void) const { return m_rangeMax; }
// For trackbars only
- void SetTickFreq(const int n, const int pos);
+ void SetTickFreq(int n, int pos);
inline int GetTickFreq(void) const { return m_tickFreq; }
- void SetPageSize(const int pageSize);
+ void SetPageSize(int pageSize);
int GetPageSize(void) const ;
void ClearSel(void) ;
void ClearTicks(void) ;
- void SetLineSize(const int lineSize);
+ void SetLineSize(int lineSize);
int GetLineSize(void) const ;
int GetSelEnd(void) const ;
int GetSelStart(void) const ;
- void SetSelection(const int minPos, const int maxPos);
- void SetThumbLength(const int len) ;
+ void SetSelection(int minPos, int maxPos);
+ void SetThumbLength(int len) ;
int GetThumbLength(void) const ;
- void SetTick(const int tickPos) ;
+ void SetTick(int tickPos) ;
// IMPLEMENTATION
inline WXHWND GetStaticMin() const { return m_staticMin; }
#endif
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);
- void MSWOnVScroll(const WXWORD wParam, const WXWORD pos, const WXHWND control);
- void MSWOnHScroll(const WXWORD wParam, const WXWORD pos, const WXHWND control);
+ void MSWOnVScroll(WXWORD wParam, WXWORD pos, WXHWND control);
+ void MSWOnHScroll(WXWORD wParam, WXWORD pos, WXHWND control);
protected:
WXHWND m_staticMin;
wxSpinButton(void);
- inline wxSpinButton(wxWindow *parent, const wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
- const long style = wxSP_VERTICAL, const wxString& name = "wxSpinButton")
+ inline wxSpinButton(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
+ long style = wxSP_VERTICAL, const wxString& name = "wxSpinButton")
{
Create(parent, id, pos, size, style, name);
}
~wxSpinButton(void);
- bool Create(wxWindow *parent, const wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
- const long style = wxSP_VERTICAL, const wxString& name = "wxSpinButton");
+ bool Create(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
+ long style = wxSP_VERTICAL, const wxString& name = "wxSpinButton");
// Attributes
////////////////////////////////////////////////////////////////////////////
int GetValue(void) const ;
- void SetValue(const int val) ;
- void SetRange(const int minVal, const int maxVal) ;
+ void SetValue(int val) ;
+ void SetRange(int minVal, int maxVal) ;
inline int GetMin(void) const { return m_min; }
inline int GetMax(void) const { return m_max; }
void Command(wxCommandEvent& event) { ProcessCommand(event); };
// IMPLEMENTATION
- bool MSWCommand(const WXUINT param, const WXWORD id);
- bool MSWNotify(const WXWPARAM wParam, const WXLPARAM lParam);
- void MSWOnVScroll(const WXWORD wParam, const WXWORD pos, const WXHWND control);
- void MSWOnHScroll(const WXWORD wParam, const WXWORD pos, const WXHWND control);
+ bool MSWCommand(WXUINT param, WXWORD id);
+ bool MSWNotify(WXWPARAM wParam, WXLPARAM lParam);
+ void MSWOnVScroll(WXWORD wParam, WXWORD pos, WXHWND control);
+ void MSWOnHScroll(WXWORD wParam, WXWORD pos, WXHWND control);
protected:
int m_min;
public:
inline wxStaticBitmap(void) { }
- inline wxStaticBitmap(wxWindow *parent, const wxWindowID id,
+ inline wxStaticBitmap(wxWindow *parent, wxWindowID id,
const wxBitmap& label,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
- const long style = 0,
+ long style = 0,
const wxString& name = wxStaticBitmapNameStr)
{
Create(parent, id, label, pos, size, style, name);
}
- bool Create(wxWindow *parent, const wxWindowID id,
+ bool Create(wxWindow *parent, wxWindowID id,
const wxBitmap& label,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
- const long style = 0,
+ long style = 0,
const wxString& name = wxStaticBitmapNameStr);
virtual void SetBitmap(const wxBitmap& bitmap);
virtual void Command(wxCommandEvent& WXUNUSED(event)) {};
virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {};
- 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);
inline wxBitmap& GetBitmap(void) const { return (wxBitmap&) m_messageBitmap; }
public:
inline wxStaticBox(void) {}
- inline wxStaticBox(wxWindow *parent, const wxWindowID id,
+ inline wxStaticBox(wxWindow *parent, wxWindowID id,
const wxString& label,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
- const long style = 0,
+ long style = 0,
const wxString& name = wxStaticBoxNameStr)
{
Create(parent, id, label, pos, size, style, name);
}
- bool Create(wxWindow *parent, const wxWindowID id,
+ bool Create(wxWindow *parent, wxWindowID id,
const wxString& label,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
- const long style = 0,
+ long style = 0,
const wxString& name = wxStaticBoxNameStr);
virtual void Command(wxCommandEvent& WXUNUSED(event)) {};
virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
- 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 SetLabel(const wxString& label);
- 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);
DECLARE_EVENT_TABLE()
bool Create(wxWindow *parent, wxWindowID id = -1, long style = wxST_SIZEGRIP);
// a status line can have several (<256) fields numbered from 0
- virtual void SetFieldsCount(int number = 1, const int *widths = NULL);
+ virtual void SetFieldsCount(int number = 1, int *widths = NULL);
// each field of status line has it's own text
- virtual void SetStatusText(const wxString& text, const int number = 0);
+ virtual void SetStatusText(const wxString& text, int number = 0);
virtual wxString GetStatusText(int number = 0) const;
// set status line fields' widths
- virtual void SetStatusWidths(int n, const int *widths_field);
+ virtual void SetStatusWidths(int n, int *widths_field);
// we're going to process WM_SIZE (of the parent window)
void OnSize(wxSizeEvent& event);
DECLARE_EVENT_TABLE()
protected:
- void CopyFieldsWidth(const int *widths);
+ void CopyFieldsWidth(int *widths);
void SetFieldsWidth();
};
public:
inline wxStaticText(void) { }
- inline wxStaticText(wxWindow *parent, const wxWindowID id,
+ inline wxStaticText(wxWindow *parent, wxWindowID id,
const wxString& label,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
- const long style = 0,
+ long style = 0,
const wxString& name = wxStaticTextNameStr)
{
Create(parent, id, label, pos, size, style, name);
}
- bool Create(wxWindow *parent, const wxWindowID id,
+ bool Create(wxWindow *parent, wxWindowID id,
const wxString& label,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
- const long style = 0,
+ long style = 0,
const wxString& name = wxStaticTextNameStr);
virtual void Command(wxCommandEvent& WXUNUSED(event)) {};
virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {};
- 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 SetLabel(const wxString&);
- 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);
virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
void OnKillFocus(wxFocusEvent& event) { Default() ; }
void Command(wxCommandEvent& event);
- bool MSWCommand(const WXUINT param, const WXWORD id);
- bool MSWNotify(const WXWPARAM wParam, const WXLPARAM lParam);
+ bool MSWCommand(WXUINT param, WXWORD id);
+ bool MSWNotify(WXWPARAM wParam, WXLPARAM lParam);
// Responds to colour changes
void OnSysColourChanged(wxSysColourChangedEvent& event);
Create(parent, -1, wxPoint(x, y), wxSize(w, h), style, orientation, RowsOrColumns, name);
}
#endif
- inline wxToolBar95(wxWindow *parent, const wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
- const long style = wxNO_BORDER, const int orientation = wxVERTICAL,
- const int RowsOrColumns = 1, const wxString& name = wxToolBarNameStr)
+ inline wxToolBar95(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
+ long style = wxNO_BORDER, int orientation = wxVERTICAL,
+ int RowsOrColumns = 1, const wxString& name = wxToolBarNameStr)
{
Create(parent, id, pos, size, style, orientation, RowsOrColumns, name);
}
~wxToolBar95(void);
- bool Create(wxWindow *parent, const wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
- const long style = wxNO_BORDER, const int orientation = wxVERTICAL,
- const int RowsOrColumns = 1, const wxString& name = wxToolBarNameStr);
+ bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
+ long style = wxNO_BORDER, int orientation = wxVERTICAL,
+ int RowsOrColumns = 1, const wxString& name = wxToolBarNameStr);
// Call default behaviour
void OnPaint(wxPaintEvent& event) { Default() ; }
// If pushedBitmap is NULL, a reversed version of bitmap is
// created and used as the pushed/toggled image.
// If toggle is TRUE, the button toggles between the two states.
- wxToolBarTool *AddTool(const int toolIndex, const wxBitmap& bitmap, const wxBitmap& pushedBitmap = wxNullBitmap,
- const bool toggle = FALSE, const long xPos = -1, const long yPos = -1, wxObject *clientData = NULL,
+ wxToolBarTool *AddTool(int toolIndex, const wxBitmap& bitmap, const wxBitmap& pushedBitmap = wxNullBitmap,
+ bool toggle = FALSE, long xPos = -1, long yPos = -1, wxObject *clientData = NULL,
const wxString& helpString1 = "", const wxString& helpString2 = "");
// New members
// Set default bitmap size
void SetDefaultSize(const wxSize& size);
- void EnableTool(const int toolIndex, const bool enable); // additional drawing on enabling
- void ToggleTool(const int toolIndex, const bool toggle); // toggle is TRUE if toggled on
+ void EnableTool(int toolIndex, bool enable); // additional drawing on enabling
+ void ToggleTool(int toolIndex, bool toggle); // toggle is TRUE if toggled on
void ClearTools(void);
// The button size is bigger than the bitmap size
// Add all the buttons: required for Win95.
virtual bool CreateTools(void);
- virtual void SetRows(const int nRows);
+ virtual void SetRows(int nRows);
virtual void Layout(void) {}
// IMPLEMENTATION
- bool MSWCommand(const WXUINT param, const WXWORD id);
- bool MSWNotify(const WXWPARAM wParam, const WXLPARAM lParam);
+ bool MSWCommand(WXUINT param, WXWORD id);
+ bool MSWNotify(WXWPARAM wParam, WXLPARAM lParam);
// Responds to colour changes
void OnSysColourChanged(wxSysColourChangedEvent& event);
Create(parent, -1, wxPoint(x, y), wxSize(w, h), style, orientation, RowsOrColumns, name);
}
#endif
- inline wxToolBarMSW(wxWindow *parent, const wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
- const long style = wxNO_BORDER, const int orientation = wxVERTICAL,
- const int RowsOrColumns = 2, const wxString& name = wxButtonBarNameStr)
+ inline wxToolBarMSW(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
+ long style = wxNO_BORDER, int orientation = wxVERTICAL,
+ int RowsOrColumns = 2, const wxString& name = wxButtonBarNameStr)
{
Create(parent, id, pos, size, style, orientation, RowsOrColumns, name);
}
- bool Create(wxWindow *parent, const wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
- const long style = wxNO_BORDER, const int orientation = wxVERTICAL,
- const int RowsOrColumns = 2, const wxString& name = wxButtonBarNameStr);
+ bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
+ long style = wxNO_BORDER, int orientation = wxVERTICAL,
+ int RowsOrColumns = 2, const wxString& name = wxButtonBarNameStr);
~wxToolBarMSW(void);
// If pushedBitmap is NULL, a reversed version of bitmap is
// created and used as the pushed/toggled image.
// If toggle is TRUE, the button toggles between the two states.
- wxToolBarTool *AddTool(const int toolIndex, const wxBitmap& bitmap, const wxBitmap& pushedBitmap = wxNullBitmap,
- const bool toggle = FALSE, const long xPos = -1, const long yPos = -1, wxObject *clientData = NULL,
+ wxToolBarTool *AddTool(int toolIndex, const wxBitmap& bitmap, const wxBitmap& pushedBitmap = wxNullBitmap,
+ bool toggle = FALSE, long xPos = -1, long yPos = -1, wxObject *clientData = NULL,
const wxString& helpString1 = "", const wxString& helpString2 = "");
void DrawTool(wxDC& dc, wxMemoryDC& memDc, wxToolBarTool *tool);
// New members
// Set default bitmap size
virtual void SetDefaultSize(const wxSize& size);
- void EnableTool(const int toolIndex, const bool enable); // additional drawing on enabling
+ void EnableTool(int toolIndex, bool enable); // additional drawing on enabling
// The button size is bigger than the bitmap size
wxSize GetDefaultButtonSize(void) const;
wxString fileName;
public:
wxTextCtrl(void);
- inline wxTextCtrl(wxWindow *parent, const wxWindowID id,
+ inline wxTextCtrl(wxWindow *parent, wxWindowID id,
const wxString& value = wxEmptyString,
const wxPoint& pos = wxDefaultPosition,
- const wxSize& size = wxDefaultSize, const long style = 0,
+ const wxSize& size = wxDefaultSize, long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxTextCtrlNameStr)
#ifndef NO_TEXT_WINDOW_STREAM
Create(parent, id, value, pos, size, style, validator, name);
}
- bool Create(wxWindow *parent, const wxWindowID id,
+ bool Create(wxWindow *parent, wxWindowID id,
const wxString& value = wxEmptyString,
const wxPoint& pos = wxDefaultPosition,
- const wxSize& size = wxDefaultSize, const long style = 0,
+ const wxSize& size = wxDefaultSize, long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxTextCtrlNameStr);
virtual wxString GetValue(void) const ;
virtual void SetValue(const wxString& value);
- 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);
// Clipboard operations
virtual void Copy(void);
virtual void Cut(void);
virtual void Paste(void);
- virtual void SetInsertionPoint(const long pos);
+ virtual void SetInsertionPoint(long pos);
virtual void SetInsertionPointEnd(void);
virtual long GetInsertionPoint(void) const ;
virtual long GetLastPosition(void) const ;
- virtual void Replace(const long from, const long to, const wxString& value);
- virtual void Remove(const long from, const long to);
- virtual void SetSelection(const long from, const long to);
+ virtual void Replace(long from, long to, const wxString& value);
+ virtual void Remove(long from, long to);
+ virtual void SetSelection(long from, long to);
virtual void Command(wxCommandEvent& event);
- virtual void SetEditable(const bool editable);
+ virtual void SetEditable(bool editable);
#ifndef NO_TEXT_WINDOW_STREAM
int overflow(int i);
void OnDropFiles(wxDropFilesEvent& event);
wxTextCtrl& operator<<(const wxString& s);
- wxTextCtrl& operator<<(const int i);
- wxTextCtrl& operator<<(const long i);
- wxTextCtrl& operator<<(const float f);
- wxTextCtrl& operator<<(const double d);
+ wxTextCtrl& operator<<(int i);
+ wxTextCtrl& operator<<(long i);
+ wxTextCtrl& operator<<(float f);
+ wxTextCtrl& operator<<(double d);
wxTextCtrl& operator<<(const char c);
virtual bool LoadFile(const wxString& file);
inline bool Modified(void) const { return IsModified(); }
#endif
- virtual long XYToPosition(const long x, const long y) const ;
- virtual void PositionToXY(const long pos, long *x, long *y) const ;
- virtual void ShowPosition(const long pos);
- virtual int GetLineLength(const long lineNo) const ;
- virtual wxString GetLineText(const long lineNo) const ;
+ virtual long XYToPosition(long x, long y) const ;
+ virtual void PositionToXY(long pos, long *x, long *y) const ;
+ virtual void ShowPosition(long pos);
+ virtual int GetLineLength(long lineNo) const ;
+ virtual wxString GetLineText(long lineNo) const ;
virtual int GetNumberOfLines(void) const ;
virtual void Clear(void);
void OnEraseBackground(wxEraseEvent& event);
// Implementation
- virtual bool MSWCommand(const WXUINT param, const WXWORD id);
+ virtual bool MSWCommand(WXUINT param, WXWORD id);
inline bool IsRich(void) { return m_isRich; }
- inline void SetRichEdit(const bool isRich) { m_isRich = isRich; }
- virtual WXHBRUSH OnCtlColor(const WXHDC pDC, const WXHWND pWnd, const WXUINT nCtlColor,
+ inline void SetRichEdit(bool isRich) { m_isRich = isRich; }
+ virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
wxTreeCtrl(void);
- inline wxTreeCtrl(wxWindow *parent, const wxWindowID id = -1,
+ inline wxTreeCtrl(wxWindow *parent, wxWindowID id = -1,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
- const long style = wxTR_HAS_BUTTONS|wxTR_LINES_AT_ROOT,
+ long style = wxTR_HAS_BUTTONS|wxTR_LINES_AT_ROOT,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = "wxTreeCtrl")
{
}
~wxTreeCtrl(void);
- bool Create(wxWindow *parent, const wxWindowID id = -1,
+ bool Create(wxWindow *parent, wxWindowID id = -1,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
- const long style = wxTR_HAS_BUTTONS|wxTR_LINES_AT_ROOT,
+ long style = wxTR_HAS_BUTTONS|wxTR_LINES_AT_ROOT,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = "wxTreeCtrl");
int GetCount(void) const ;
int GetIndent(void) const ;
void SetIndent(int indent) ;
- wxImageList *GetImageList(const int which = wxIMAGE_LIST_NORMAL) const ;
- void SetImageList(wxImageList *imageList, const int which = wxIMAGE_LIST_NORMAL) ;
- long GetNextItem(const long item, int code) const ;
- bool ItemHasChildren(const long item) const ;
- long GetChild(const long item) const ;
- long GetParent(const long item) const ;
+ wxImageList *GetImageList(int which = wxIMAGE_LIST_NORMAL) const ;
+ void SetImageList(wxImageList *imageList, int which = wxIMAGE_LIST_NORMAL) ;
+ long GetNextItem(long item, int code) const ;
+ bool ItemHasChildren(long item) const ;
+ long GetChild(long item) const ;
+ long GetParent(long item) const ;
long GetFirstVisibleItem(void) const ;
- long GetNextVisibleItem(const long item) const ;
+ long GetNextVisibleItem(long item) const ;
long GetSelection(void) const ;
long GetRootItem(void) const ;
bool GetItem(wxTreeItem& info) const ;
bool SetItem(wxTreeItem& info) ;
- int GetItemState(const long item, const long stateMask) const ;
- bool SetItemState(const long item, const long state, const long stateMask) ;
- bool SetItemImage(const long item, const int image, const int selImage) ;
- wxString GetItemText(const long item) const ;
- void SetItemText(const long item, const wxString& str) ;
- long GetItemData(const long item) const ;
- bool SetItemData(const long item, long data) ;
- bool GetItemRect(const long item, wxRectangle& rect, bool textOnly = FALSE) const;
+ int GetItemState(long item, long stateMask) const ;
+ bool SetItemState(long item, long state, long stateMask) ;
+ bool SetItemImage(long item, int image, int selImage) ;
+ wxString GetItemText(long item) const ;
+ void SetItemText(long item, const wxString& str) ;
+ long GetItemData(long item) const ;
+ bool SetItemData(long item, long data) ;
+ bool GetItemRect(long item, wxRectangle& rect, bool textOnly = FALSE) const;
wxTextCtrl& GetEditControl(void) const;
// Operations
- bool DeleteItem(const long item);
- bool ExpandItem(const long item, const int action);
- long InsertItem(const long parent, wxTreeItem& info, const long insertAfter = wxTREE_INSERT_LAST);
+ bool DeleteItem(long item);
+ bool ExpandItem(long item, int action);
+ long InsertItem(long parent, wxTreeItem& info, long insertAfter = wxTREE_INSERT_LAST);
// If image > -1 and selImage == -1, the same image is used for
// both selected and unselected items.
- long InsertItem(const long parent, const wxString& label, const int image = -1, const int selImage = -1, const long insertAfter = wxTREE_INSERT_LAST);
- bool SelectItem(const long item);
- bool ScrollTo(const long item);
+ long InsertItem(long parent, const wxString& label, int image = -1, int selImage = -1, long insertAfter = wxTREE_INSERT_LAST);
+ bool SelectItem(long item);
+ bool ScrollTo(long item);
bool DeleteAllItems(void) ;
- wxTextCtrl& Edit(const long item) ;
+ wxTextCtrl& Edit(long item) ;
long HitTest(const wxPoint& point, int& flags);
-// wxImageList *CreateDragImage(const long item) ;
- bool SortChildren(const long item) ;
- bool EnsureVisible(const long item) ;
+// wxImageList *CreateDragImage(long item) ;
+ bool SortChildren(long item) ;
+ bool EnsureVisible(long item) ;
void Command(wxCommandEvent& event) { ProcessCommand(event); };
// IMPLEMENTATION
- bool MSWCommand(const WXUINT param, const WXWORD id);
- bool MSWNotify(const WXWPARAM wParam, const WXLPARAM lParam);
+ bool MSWCommand(WXUINT param, WXWORD id);
+ bool MSWNotify(WXWPARAM wParam, WXLPARAM lParam);
protected:
wxTextCtrl m_textCtrl;
public:
wxWindow(void);
- inline wxWindow(wxWindow *parent, const wxWindowID id,
+ inline wxWindow(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
- const long style = 0,
+ long style = 0,
const wxString& name = wxPanelNameStr)
{
m_children = new wxList;
virtual ~wxWindow(void);
- bool Create(wxWindow *parent, const wxWindowID id,
+ bool Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
- const long style = 0,
+ long style = 0,
const wxString& name = wxPanelNameStr);
// Fit the window around the items
virtual void Fit(void);
// Show or hide the window
- virtual bool Show(const bool show);
+ virtual bool Show(bool show);
// Is the window shown?
virtual bool IsShown(void) const;
virtual void GetClientSize(int *width, int *height) const;
// Set overall size and position
- virtual void SetSize(const int x, const int y, const int width, const int height, const int sizeFlags = wxSIZE_AUTO);
- inline virtual void SetSize(const int width, const int height) { SetSize(-1, -1, width, height, wxSIZE_USE_EXISTING); }
- inline virtual void Move(const int x, const int y) { SetSize(x, y, -1, -1, wxSIZE_USE_EXISTING); }
+ virtual void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
+ inline virtual void SetSize(int width, int height) { SetSize(-1, -1, width, height, wxSIZE_USE_EXISTING); }
+ inline virtual void Move(int x, int y) { SetSize(x, y, -1, -1, wxSIZE_USE_EXISTING); }
// Set client size
- virtual void SetClientSize(const int width, const int size);
+ virtual void SetClientSize(int width, int size);
// Convert client to screen coordinates
virtual void ClientToScreen(int *x, int *y) const;
virtual void ReleaseMouse(void);
// Enable or disable the window
- virtual void Enable(const bool enable);
+ virtual void Enable(bool enable);
#if USE_DRAG_AND_DROP
// Associate a drop target with this window (if the window already had a drop
#endif
// Accept files for dragging
- virtual void DragAcceptFiles(const bool accept);
+ virtual void DragAcceptFiles(bool accept);
// Set/get the window title
virtual inline void SetTitle(const wxString& WXUNUSED(title)) {};
inline virtual void SetName(const wxString& name);
// Centre the window
- virtual void Centre(const int direction) ;
- inline void Center(const int direction = wxHORIZONTAL) { Centre(direction); }
+ virtual void Centre(int direction) ;
+ inline void Center(int direction = wxHORIZONTAL) { Centre(direction); }
// Popup a menu
- virtual bool PopupMenu(wxMenu *menu, const int x, const int y);
+ virtual bool PopupMenu(wxMenu *menu, int x, int y);
// Send the window a refresh event
- virtual void Refresh(const bool eraseBack = TRUE, const wxRectangle *rect = NULL);
+ virtual void Refresh(bool eraseBack = TRUE, const wxRectangle *rect = NULL);
#if WXWIN_COMPATIBILITY
// Set/get scroll attributes
- virtual void SetScrollRange(const int orient, const int range, const bool refresh = TRUE);
- virtual void SetScrollPage(const int orient, const int page, const bool refresh = TRUE);
- virtual int OldGetScrollRange(const int orient) const;
- virtual int GetScrollPage(const int orient) const;
+ virtual void SetScrollRange(int orient, int range, bool refresh = TRUE);
+ virtual void SetScrollPage(int orient, int page, bool refresh = TRUE);
+ virtual int OldGetScrollRange(int orient) const;
+ virtual int GetScrollPage(int orient) const;
#endif
// New functions that will replace the above.
- virtual void SetScrollbar(const int orient, const int pos, const int thumbVisible,
- const int range, const bool refresh = TRUE);
+ virtual void SetScrollbar(int orient, int pos, int thumbVisible,
+ int range, bool refresh = TRUE);
- virtual void SetScrollPos(const int orient, const int pos, const bool refresh = TRUE);
- virtual int GetScrollPos(const int orient) const;
- virtual int GetScrollRange(const int orient) const;
- virtual int GetScrollThumb(const int orient) const;
+ virtual void SetScrollPos(int orient, int pos, bool refresh = TRUE);
+ virtual int GetScrollPos(int orient) const;
+ virtual int GetScrollRange(int orient) const;
+ virtual int GetScrollThumb(int orient) const;
- virtual void ScrollWindow(const int dx, const int dy, const wxRectangle *rect = NULL);
+ virtual void ScrollWindow(int dx, int dy, const wxRectangle *rect = NULL);
// Caret manipulation
- virtual void CreateCaret(const int w, const int h);
+ virtual void CreateCaret(int w, int h);
virtual void CreateCaret(const wxBitmap *bitmap);
virtual void DestroyCaret(void);
- virtual void ShowCaret(const bool show);
- virtual void SetCaretPos(const int x, const int y);
+ virtual void ShowCaret(bool show);
+ virtual void SetCaretPos(int x, int y);
virtual void GetCaretPos(int *x, int *y) const;
// Tell window how much it can be sized
- virtual void SetSizeHints(const int minW = -1, const int minH = -1, const int maxW = -1, const int maxH = -1, const int incW = -1, const int incH = -1);
+ virtual void SetSizeHints(int minW = -1, int minH = -1, int maxW = -1, int maxH = -1, int incW = -1, int incH = -1);
// Set/get the window's identifier
inline int GetId() const;
- inline void SetId(const int id);
+ inline void SetId(int id);
// Make the window modal (all other windows unresponsive)
- virtual void MakeModal(const bool modal);
+ virtual void MakeModal(bool modal);
// Get the private handle (platform-dependent)
inline void *GetHandle(void) const;
inline wxValidator *GetValidator(void) const;
// Set/get the window's style
- inline void SetWindowStyleFlag(const long flag);
+ inline void SetWindowStyleFlag(long flag);
inline long GetWindowStyleFlag(void) const;
// Set/get double-clickability
// TODO: we probably wish to get rid of this, and
// always allow double clicks.
- inline void SetDoubleClick(const bool flag);
+ inline void SetDoubleClick(bool flag);
inline bool GetDoubleClick(void) const;
- inline void AllowDoubleClick(const bool value) { SetDoubleClick(value); }
+ inline void AllowDoubleClick(bool value) { SetDoubleClick(value); }
// Old way to handle a control command
virtual void OnCommand(wxWindow& win, wxCommandEvent& event);
wxEvtHandler *PopEventHandler(bool deleteHandler = FALSE) ;
// Close the window by calling OnClose, posting a deletion
- virtual bool Close(const bool force = FALSE);
+ virtual bool Close(bool force = FALSE);
// Destroy the window (delayed, if a managed window)
virtual bool Destroy(void) ;
// Mode for telling default OnSize members to
// call Layout(), if not using Sizers, just top-down constraints
- inline void SetAutoLayout(const bool a);
+ inline void SetAutoLayout(bool a);
inline bool GetAutoLayout(void) const;
// Set/get constraints
#endif
// Native resource loading
- virtual bool LoadNativeDialog(wxWindow* parent, const wxWindowID& id);
+ virtual bool LoadNativeDialog(wxWindow* parent, wxWindowID& id);
virtual bool LoadNativeDialog(wxWindow* parent, const wxString& name);
- virtual wxWindow* GetWindowChild1(const wxWindowID& id);
- virtual wxWindow* GetWindowChild(const wxWindowID& id);
+ virtual wxWindow* GetWindowChild1(wxWindowID& id);
+ virtual wxWindow* GetWindowChild(wxWindowID& id);
virtual void GetTextExtent(const wxString& string, int *x, int *y,
int *descent = NULL,
int *externalLeading = NULL,
- const wxFont *theFont = NULL, const bool use16 = FALSE) const;
-#if WXWIN_COMPATIBILITY
- void GetTextExtent(const wxString& string, float *x, float *y,
- float *descent = NULL,
- float *externalLeading = NULL,
- const wxFont *theFont = NULL, const bool use16 = FALSE) const;
-#endif
-
- // Gets 'context' member
- // OBSOLETE
- // TODO: how to make backward compatible?
-// inline wxDC *GetDC(void) const;
+ const wxFont *theFont = NULL, bool use16 = FALSE) const;
// Is the window retained?
inline bool IsRetained(void) const;
- // Set the window's colourmap/palette
- // OBSOLETE
-// virtual void SetPalette(wxPalette *palette);
-
// Warp the pointer the given position
- virtual void WarpPointer(const int x_pos, const int y_pos) ;
+ virtual void WarpPointer(int x_pos, int y_pos) ;
// Clear the window
virtual void Clear(void);
// Find a window by id or name
- virtual wxWindow *FindWindow(const long id);
+ virtual wxWindow *FindWindow(long id);
virtual wxWindow *FindWindow(const wxString& name);
// Constraint operations
// virtual void OnChangeFocus(wxControl *from, wxControl *to);
// virtual bool OnFunctionKey(wxKeyEvent &event);
+/*
#if WXWIN_COMPATIBILITY
virtual void OldOnMenuSelect(int WXUNUSED(cmd));
virtual void OldOnInitMenuPopup(int WXUNUSED(pos));
virtual void OldOnSetFocus(void); // Called on setting focus
virtual void OldOnKillFocus(void); // Called on killing focus
#endif
-
-/* THIS IS NOW OBSOLETE - all positions are in device units
- // Calculates the position of a point on the window
- // taking into account the position of scrollbars.
- // Windows doesn't automatically reflect the position of the
- // scrollbars - (0, 0) is always the top left of the visible window,
- // whereas in XView, (0, 0) moves according to scrollbar positions.
- virtual void CalcScrolledPosition(const int x, const int y, int *xx, int *yy) const ;
-
- // Calculate logical (scroll-bar/scaling aware) position from
- // device (pixel) position
- virtual void CalcUnscrolledPosition(const int x, const int y, float *xx, float *yy) const ;
*/
public:
void SubclassWin(WXHWND hWnd);
void UnsubclassWin(void);
virtual long Default(void);
- virtual bool MSWCommand(const WXUINT param, const WXWORD id);
- virtual bool MSWNotify(const WXWPARAM wParam, const WXLPARAM lParam);
- virtual wxWindow *FindItem(const int id) const;
- virtual wxWindow *FindItemByHWND(const WXHWND hWnd, bool controlOnly = FALSE) const ;
- virtual void PreDelete(const WXHDC dc); // Allows system cleanup
+ virtual bool MSWCommand(WXUINT param, WXWORD id);
+ virtual bool MSWNotify(WXWPARAM wParam, WXLPARAM lParam);
+ virtual wxWindow *FindItem(int id) const;
+ virtual wxWindow *FindItemByHWND(WXHWND hWnd, bool controlOnly = FALSE) const ;
+ virtual void PreDelete(WXHDC dc); // Allows system cleanup
// TO DO: how many of these need to be virtual?
virtual WXHWND GetHWND(void) const ;
virtual void SetHWND(WXHWND hWnd);
void DeleteRelatedConstraints(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 LayoutPhase2(int *noChanges);
- virtual bool DoPhase(const int);
+ virtual bool DoPhase(int);
// Transforms from sizer coordinate space to actual
// parent coordinate space
virtual void TransformSizerToActual(int *x, int *y) const ;
// Set size with transformation to actual coordinates if nec.
- virtual void SizerSetSize(const int x, const int y, const int w, const int h);
- virtual void SizerMove(const int x, const int y);
+ virtual void SizerSetSize(int x, int y, int w, int h);
+ virtual void SizerMove(int x, int y);
// Only set/get the size/position of the constraint (if any)
- virtual void SetSizeConstraint(const int x, const int y, const int w, const int h);
- virtual void MoveConstraint(const int x, const int y);
+ virtual void SetSizeConstraint(int x, int y, int w, int h);
+ virtual void MoveConstraint(int x, int y);
virtual void GetSizeConstraint(int *w, int *h) const ;
virtual void GetClientSizeConstraint(int *w, int *h) const ;
virtual void GetPositionConstraint(int *x, int *y) const ;
- wxObject *GetChild(const int number) const ;
+ wxObject *GetChild(int number) const ;
- void MSWCreate(const int id, wxWindow *parent, const char *wclass, wxWindow *wx_win, const char *title,
- const int x, const int y, const int width, const int height,
- const WXDWORD style, const char *dialog_template = NULL,
- const WXDWORD exendedStyle = 0);
+ void MSWCreate(int id, wxWindow *parent, const char *wclass, wxWindow *wx_win, const char *title,
+ int x, int y, int width, int height,
+ WXDWORD style, const char *dialog_template = NULL,
+ WXDWORD exendedStyle = 0);
// Actually defined in wx_canvs.cc since requires wxCanvas declaration
virtual void MSWDeviceToLogical(float *x, float *y) const ;
virtual void MSWOnCreate(WXLPCREATESTRUCT cs);
virtual bool MSWOnPaint(void);
virtual WXHICON MSWOnQueryDragIcon(void) { return 0; }
- virtual void MSWOnSize(const int x, const int y, const WXUINT flag);
+ virtual void MSWOnSize(int x, int y, WXUINT flag);
virtual void MSWOnWindowPosChanging(void *lpPos);
- virtual void MSWOnHScroll(const WXWORD nSBCode, const WXWORD pos, const WXHWND control);
- virtual void MSWOnVScroll(const WXWORD nSBCode, const WXWORD pos, const WXHWND control);
- virtual bool MSWOnCommand(const WXWORD id, const WXWORD cmd, const WXHWND control);
+ virtual void MSWOnHScroll(WXWORD nSBCode, WXWORD pos, WXHWND control);
+ virtual void MSWOnVScroll(WXWORD nSBCode, WXWORD pos, WXHWND control);
+ virtual bool MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND control);
virtual long MSWOnSysCommand(WXWPARAM wParam, WXLPARAM lParam);
- virtual bool MSWOnNotify(const WXWPARAM wParam, const WXLPARAM lParam);
- virtual WXHBRUSH MSWOnCtlColor(const WXHDC dc, const WXHWND pWnd, const WXUINT nCtlColor,
- const WXUINT message, const WXWPARAM wParam, const WXLPARAM lParam);
- virtual bool MSWOnColorChange(const WXHWND hWnd, const WXUINT message, const WXWPARAM wParam, const WXLPARAM lParam);
- virtual bool MSWOnEraseBkgnd(const WXHDC pDC);
- virtual void MSWOnMenuHighlight(const WXWORD item, const WXWORD flags, const WXHMENU sysmenu);
- virtual void MSWOnInitMenuPopup(const WXHMENU menu, const int pos, const bool isSystem);
+ virtual bool MSWOnNotify(WXWPARAM wParam, WXLPARAM lParam);
+ virtual WXHBRUSH MSWOnCtlColor(WXHDC dc, WXHWND pWnd, WXUINT nCtlColor,
+ WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
+ virtual bool MSWOnColorChange(WXHWND hWnd, WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
+ virtual bool MSWOnEraseBkgnd(WXHDC pDC);
+ virtual void MSWOnMenuHighlight(WXWORD item, WXWORD flags, WXHMENU sysmenu);
+ virtual void MSWOnInitMenuPopup(WXHMENU menu, int pos, bool isSystem);
virtual bool MSWOnClose(void);
virtual bool MSWOnDestroy(void);
- virtual bool MSWOnSetFocus(const WXHWND wnd);
- virtual bool MSWOnKillFocus(const WXHWND wnd);
- virtual void MSWOnDropFiles(const WXWPARAM wParam);
+ virtual bool MSWOnSetFocus(WXHWND wnd);
+ virtual bool MSWOnKillFocus(WXHWND wnd);
+ virtual void MSWOnDropFiles(WXWPARAM wParam);
virtual bool MSWOnInitDialog(WXHWND hWndFocus);
virtual void MSWOnShow(bool show, int status);
// TODO: rationalise these functions into 1 or 2 which take the
// event type as argument.
- virtual void MSWOnLButtonDown(const int x, const int y, const WXUINT flags);
- virtual void MSWOnLButtonUp(const int x, const int y, const WXUINT flags);
- virtual void MSWOnLButtonDClick(const int x, const int y, const WXUINT flags);
+ virtual void MSWOnLButtonDown(int x, int y, WXUINT flags);
+ virtual void MSWOnLButtonUp(int x, int y, WXUINT flags);
+ virtual void MSWOnLButtonDClick(int x, int y, WXUINT flags);
- virtual void MSWOnMButtonDown(const int x, const int y, const WXUINT flags);
- virtual void MSWOnMButtonUp(const int x, const int y, const WXUINT flags);
- virtual void MSWOnMButtonDClick(const int x, const int y, const WXUINT flags);
+ virtual void MSWOnMButtonDown(int x, int y, WXUINT flags);
+ virtual void MSWOnMButtonUp(int x, int y, WXUINT flags);
+ virtual void MSWOnMButtonDClick(int x, int y, WXUINT flags);
- virtual void MSWOnRButtonDown(const int x, const int y, const WXUINT flags);
- virtual void MSWOnRButtonUp(const int x, const int y, const WXUINT flags);
- virtual void MSWOnRButtonDClick(const int x, const int y, const WXUINT flags);
+ virtual void MSWOnRButtonDown(int x, int y, WXUINT flags);
+ virtual void MSWOnRButtonUp(int x, int y, WXUINT flags);
+ virtual void MSWOnRButtonDClick(int x, int y, WXUINT flags);
- virtual void MSWOnMouseMove(const int x, const int y, const WXUINT flags);
- virtual void MSWOnMouseEnter(const int x, const int y, const WXUINT flags);
- virtual void MSWOnMouseLeave(const int x, const int y, const WXUINT flags);
+ virtual void MSWOnMouseMove(int x, int y, WXUINT flags);
+ virtual void MSWOnMouseEnter(int x, int y, WXUINT flags);
+ virtual void MSWOnMouseLeave(int x, int y, WXUINT flags);
- virtual void MSWOnChar(const WXWORD wParam, const WXLPARAM lParam, const bool isASCII = FALSE);
+ virtual void MSWOnChar(WXWORD wParam, WXLPARAM lParam, bool isASCII = FALSE);
- virtual bool MSWOnActivate(const int flag, const bool minimized, const WXHWND activate);
- virtual long MSWOnMDIActivate(const long flag, const WXHWND activate, const WXHWND deactivate);
+ virtual bool MSWOnActivate(int flag, bool minimized, WXHWND activate);
+ virtual long MSWOnMDIActivate(long flag, WXHWND activate, WXHWND deactivate);
- virtual bool MSWOnDrawItem(const int id, WXDRAWITEMSTRUCT *item);
- virtual bool MSWOnMeasureItem(const int id, WXMEASUREITEMSTRUCT *item);
+ virtual bool MSWOnDrawItem(int id, WXDRAWITEMSTRUCT *item);
+ virtual bool MSWOnMeasureItem(int id, WXMEASUREITEMSTRUCT *item);
- virtual void MSWOnJoyDown(const int joystick, const int x, const int y, const WXUINT flags);
- virtual void MSWOnJoyUp(const int joystick, const int x, const int y, const WXUINT flags);
- virtual void MSWOnJoyMove(const int joystick, const int x, const int y, const WXUINT flags);
- virtual void MSWOnJoyZMove(const int joystick, const int z, const WXUINT flags);
+ virtual void MSWOnJoyDown(int joystick, int x, int y, WXUINT flags);
+ virtual void MSWOnJoyUp(int joystick, int x, int y, WXUINT flags);
+ virtual void MSWOnJoyMove(int joystick, int x, int y, WXUINT flags);
+ virtual void MSWOnJoyZMove(int joystick, int z, WXUINT flags);
// Window procedure
virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
void MSWDetachWindowMenu(void);
inline WXFARPROC MSWGetOldWndProc() const;
- inline void MSWSetOldWndProc(const WXFARPROC proc);
+ inline void MSWSetOldWndProc(WXFARPROC proc);
// Define for each class of dialog and control
- 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);
- inline void SetShowing(const bool show);
+ inline void SetShowing(bool show);
inline bool IsUserEnabled(void) const;
inline bool GetUseCtl3D(void) const ;
inline bool GetTransparentBackground(void) const ;
inline void *wxWindow::GetHandle(void) const { return (void *)GetHWND(); }
inline int wxWindow::GetId() const { return m_windowId; }
-inline void wxWindow::SetId(const int id) { m_windowId = id; }
+inline void wxWindow::SetId(int id) { m_windowId = id; }
inline wxWindow *wxWindow::GetParent(void) const { return m_windowParent; }
inline void wxWindow::SetParent(wxWindow *p) { m_windowParent = p; }
inline wxWindow *wxWindow::GetGrandParent(void) const { return (m_windowParent ? m_windowParent->m_windowParent : NULL); }
inline wxString wxWindow::GetName(void) const { return m_windowName; }
inline void wxWindow::SetName(const wxString& name) { m_windowName = name; }
inline long wxWindow::GetWindowStyleFlag(void) const { return m_windowStyle; }
-inline void wxWindow::SetWindowStyleFlag(const long flag) { m_windowStyle = flag; }
-inline void wxWindow::SetDoubleClick(const bool flag) { m_doubleClickAllowed = flag; }
+inline void wxWindow::SetWindowStyleFlag(long flag) { m_windowStyle = flag; }
+inline void wxWindow::SetDoubleClick(bool flag) { m_doubleClickAllowed = flag; }
inline bool wxWindow::GetDoubleClick(void) const { return m_doubleClickAllowed; }
inline void wxWindow::SetEventHandler(wxEvtHandler *handler) { m_windowEventHandler = handler; }
inline wxEvtHandler *wxWindow::GetEventHandler(void) const { return m_windowEventHandler; }
-inline void wxWindow::SetAutoLayout(const bool a) { m_autoLayout = a; }
+inline void wxWindow::SetAutoLayout(bool a) { m_autoLayout = a; }
inline bool wxWindow::GetAutoLayout(void) const { return m_autoLayout; }
inline wxLayoutConstraints *wxWindow::GetConstraints(void) const { return m_constraints; }
inline void wxWindow::SetBackgroundColour(const wxColour& col) { m_backgroundColour = col; };
inline void wxWindow::SetDefaultItem(wxButton *but) { m_defaultItem = but; }
// inline wxDC *wxWindow::GetDC(void) const { return m_windowDC; }
inline bool wxWindow::IsRetained(void) const { return ((m_windowStyle & wxRETAINED) == wxRETAINED); }
+
+/*
#if WXWIN_COMPATIBILITY
inline void wxWindow::OldOnMenuSelect(int WXUNUSED(cmd)) { Default(); };
inline void wxWindow::OldOnInitMenuPopup(int WXUNUSED(pos)) { Default(); };
inline void wxWindow::OldOnMove(int WXUNUSED(x), int WXUNUSED(y)) { Default(); }; // Called on move
inline void wxWindow::OldOnActivate(bool WXUNUSED(active)) { Default(); }; // Called on window activation (MSW)
#endif
-inline void wxWindow::SetShowing(const bool show) { m_isShown = show; }
+*/
+
+inline void wxWindow::SetShowing(bool show) { m_isShown = show; }
inline wxList *wxWindow::GetConstraintsInvolvedIn(void) const { return m_constraintsInvolvedIn; }
inline wxSizer *wxWindow::GetSizer(void) const { return m_windowSizer; }
inline wxWindow *wxWindow::GetSizerParent(void) const { return m_sizerParent; }
inline void wxWindow::SetSizerParent(wxWindow *win) { m_sizerParent = win; }
inline WXFARPROC wxWindow::MSWGetOldWndProc() const { return m_oldWndProc; }
-inline void wxWindow::MSWSetOldWndProc(const WXFARPROC proc) { m_oldWndProc = proc; }
+inline void wxWindow::MSWSetOldWndProc(WXFARPROC proc) { m_oldWndProc = proc; }
inline wxValidator *wxWindow::GetValidator(void) const { return m_windowValidator; }
inline bool wxWindow::IsUserEnabled(void) const { return m_winEnabled; }
inline bool wxWindow::GetUseCtl3D(void) const { return m_useCtl3D; }
public:
wxPostScriptPrintDialog (wxWindow *parent, const wxString& title,
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
- const long style = wxDEFAULT_DIALOG_STYLE);
+ long style = wxDEFAULT_DIALOG_STYLE);
virtual int ShowModal(void) ;
};
{
DECLARE_DYNAMIC_CLASS(wxToolBarTool)
public:
- wxToolBarTool(const int theIndex = 0, const wxBitmap& bitmap1 = wxNullBitmap, const wxBitmap& bitmap2 = wxNullBitmap,
- const bool toggle = FALSE, const long xPos = -1, const long yPos = -1,
+ wxToolBarTool(int theIndex = 0, const wxBitmap& bitmap1 = wxNullBitmap, const wxBitmap& bitmap2 = wxNullBitmap,
+ bool toggle = FALSE, long xPos = -1, long yPos = -1,
const wxString& shortHelpString = "", const wxString& longHelpString = "");
~wxToolBarTool ();
- inline void SetSize( const long w, const long h ) { m_width = w; m_height = h; }
+ inline void SetSize( long w, long h ) { m_width = w; m_height = h; }
inline long GetWidth () const { return m_width; }
inline long GetHeight () const { return m_height; }
// If pushedBitmap is NULL, a reversed version of bitmap is
// created and used as the pushed/toggled image.
// If toggle is TRUE, the button toggles between the two states.
- virtual wxToolBarTool *AddTool(const int toolIndex, const wxBitmap& bitmap, const wxBitmap& pushedBitmap = wxNullBitmap,
- const bool toggle = FALSE, const long xPos = -1, const long yPos = -1, wxObject *clientData = NULL,
+ virtual wxToolBarTool *AddTool(int toolIndex, const wxBitmap& bitmap, const wxBitmap& pushedBitmap = wxNullBitmap,
+ bool toggle = FALSE, long xPos = -1, long yPos = -1, wxObject *clientData = NULL,
const wxString& helpString1 = "", const wxString& helpString2 = "");
virtual void AddSeparator(void);
virtual void ClearTools(void);
- virtual void EnableTool(const int toolIndex, const bool enable);
- virtual void ToggleTool(const int toolIndex, const 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 wxObject *GetToolClientData(const int index) const;
+ virtual void EnableTool(int toolIndex, bool enable);
+ virtual void ToggleTool(int toolIndex, bool toggle); // toggle is TRUE if toggled on
+ virtual void SetToggle(int toolIndex, bool toggle); // Set this to be togglable (or not)
+ virtual wxObject *GetToolClientData(int index) const;
inline wxList& GetTools(void) const { return (wxList&) m_tools; }
// After the toolbar has initialized, this is the size the tools take up
#endif
virtual wxSize GetMaxSize ( void ) const;
- virtual bool GetToolState(const int toolIndex) const;
- virtual bool GetToolEnabled(const int toolIndex) const;
- virtual wxToolBarTool *FindToolForPosition(const long x, const long y) const;
+ virtual bool GetToolState(int toolIndex) const;
+ virtual bool GetToolEnabled(int toolIndex) const;
+ virtual wxToolBarTool *FindToolForPosition(long x, long y) const;
- virtual void SetToolShortHelp(const int toolIndex, const wxString& helpString);
- virtual wxString GetToolShortHelp(const int toolIndex) const;
- virtual void SetToolLongHelp(const int toolIndex, const wxString& helpString);
- virtual wxString GetToolLongHelp(const int toolIndex) const;
+ virtual void SetToolShortHelp(int toolIndex, const wxString& helpString);
+ virtual wxString GetToolShortHelp(int toolIndex) const;
+ virtual void SetToolLongHelp(int toolIndex, const wxString& helpString);
+ virtual wxString GetToolLongHelp(int toolIndex) const;
- virtual void SetMargins(const int x, const int y);
+ virtual void SetMargins(int x, int y);
inline void SetMargins(const wxSize& size) { SetMargins(size.x, size.y); }
- virtual void SetToolPacking(const int packing);
- virtual void SetToolSeparation(const int separation);
+ virtual void SetToolPacking(int packing);
+ virtual void SetToolSeparation(int separation);
inline virtual wxSize GetToolMargins(void) { return wxSize(m_xMargin, m_yMargin); }
inline virtual int GetToolPacking(void) { return m_toolPacking; }
// Compatibility
#if WXWIN_COMPATIBILITY
- inline void SetDefaultSize(const int w, const int h) { SetDefaultSize(wxSize(w, h)); }
+ inline void SetDefaultSize(int w, int h) { SetDefaultSize(wxSize(w, h)); }
inline long GetDefaultWidth(void) const { return m_defaultWidth; }
inline long GetDefaultHeight(void) const { return m_defaultHeight; }
inline int GetDefaultButtonWidth(void) const { return GetDefaultButtonSize().x; };
// Number of pixels per user unit (0 or -1 for no scrollbar)
// Length of virtual canvas in user units
- virtual void SetScrollbars(const int horizontal, const int vertical,
- const int x_length, const int y_length,
- const int x_pos = 0, const int y_pos = 0);
+ virtual void SetScrollbars(int horizontal, int vertical,
+ int x_length, int y_length,
+ int x_pos = 0, int y_pos = 0);
// Physically scroll the window
- virtual void Scroll(const int x_pos, const int y_pos);
+ virtual void Scroll(int x_pos, int y_pos);
virtual void GetScrollPixelsPerUnit(int *x_unit, int *y_unit) const;
- virtual void EnableScrolling(const bool x_scrolling, const bool y_scrolling);
+ virtual void EnableScrolling(bool x_scrolling, bool y_scrolling);
virtual void AdjustScrollbars(void);
// Prepare the DC by translating it according to the current scroll position
virtual void DoToolbarUpdates(void);
/*
- virtual void CalcScrolledPosition(const int x, const int y, int *xx, int *yy) const ;
- virtual void CalcUnscrolledPosition(const int x, const int y, long *xx, long *yy) const ;
+ virtual void CalcScrolledPosition(int x, int y, int *xx, int *yy) const ;
+ virtual void CalcUnscrolledPosition(int x, int y, long *xx, long *yy) const ;
*/
void OnScroll(wxScrollEvent& event);
// Required to force normal cursor-setting behaviour in Windows
#ifdef __WINDOWS__
- virtual void MSWOnMouseMove(const int x, const int y, const WXUINT flags);
+ virtual void MSWOnMouseMove(int x, int y, const WXUINT flags);
#endif
protected:
Create(parent, -1, wxPoint(x, y), wxSize(w, h), style, orientation, RowsOrColumns, name);
}
#endif
- inline wxToolBarSimple(wxWindow *parent, const wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
- const long style = wxNO_BORDER, const int orientation = wxVERTICAL,
- const int RowsOrColumns = 1, const wxString& name = wxToolBarNameStr)
+ inline wxToolBarSimple(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
+ long style = wxNO_BORDER, int orientation = wxVERTICAL,
+ int RowsOrColumns = 1, const wxString& name = wxToolBarNameStr)
{
Create(parent, id, pos, size, style, orientation, RowsOrColumns, name);
}
~wxToolBarSimple(void);
- bool Create(wxWindow *parent, const wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
- const long style = wxNO_BORDER, const int orientation = wxVERTICAL, const int RowsOrColumns = 1, const wxString& name = wxToolBarNameStr);
+ bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
+ long style = wxNO_BORDER, int orientation = wxVERTICAL, int RowsOrColumns = 1, const wxString& name = wxToolBarNameStr);
void OnPaint(wxPaintEvent& event);
void OnSize(wxSizeEvent& event);
// Handle wxToolBar events
virtual void DrawTool(wxDC& dc, wxMemoryDC& memDC, wxToolBarTool *tool);
- 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 SpringUpButton(const int index);
+ virtual void SpringUpButton(int index);
DECLARE_EVENT_TABLE()
};
{
DECLARE_DYNAMIC_CLASS(wxTextValidator)
public:
- wxTextValidator(const long style = wxFILTER_NONE, wxString *val = NULL);
+ wxTextValidator(long style = wxFILTER_NONE, wxString *val = NULL);
wxTextValidator(const wxTextValidator& val);
~wxTextValidator();
// ACCESSORS
inline long GetStyle(void) const { return m_validatorStyle; }
- inline void SetStyle(const long style) { m_validatorStyle = style; }
+ inline void SetStyle(long style) { m_validatorStyle = style; }
void SetIncludeList(const wxStringList& list);
inline wxStringList& GetIncludeList(void) { return m_includeList; }
julian = 0;
}
-wxDate::wxDate (const long j) : julian(j)
+wxDate::wxDate (long j) : julian(j)
{
DisplayFormat=wxMDY;
DisplayOptions='\0';
julian_to_mdy ();
}
-wxDate::wxDate (const int m, const int d, const int y) : month(m), day(d), year(y)
+wxDate::wxDate (int m, int d, int y) : month(m), day(d), year(y)
{
DisplayFormat=wxMDY;
DisplayOptions='\0';
// Date Arithmetic
//////////////////////////////////////////////////////////////
-wxDate wxDate::operator + (const long i)
+wxDate wxDate::operator + (long i)
{
wxDate dp(julian + i);
return dp;
}
-wxDate wxDate::operator + (const int i)
+wxDate wxDate::operator + (int i)
{
wxDate dp(julian + (long)i);
return dp;
}
-wxDate wxDate::operator - (const long i)
+wxDate wxDate::operator - (long i)
{
wxDate dp(julian - i);
return dp;
}
-wxDate wxDate::operator - (const int i)
+wxDate wxDate::operator - (int i)
{
wxDate dp(julian - (long)i);
return dp;
return ( julian - dt.julian );
}
-wxDate &wxDate::operator += (const long i)
+wxDate &wxDate::operator += (long i)
{
julian += i;
julian_to_mdy();
return *this;
}
-wxDate &wxDate::operator -= (const long i)
+wxDate &wxDate::operator -= (long i)
{
julian -= i;
julian_to_mdy();
// Format routine
////////////////////////////////////////////////////////////////
-wxString wxDate::FormatDate (const int type) const
+wxString wxDate::FormatDate (int type) const
{
int actualType = type;
if (actualType == -1)
return wxString("");
}
-void wxDate::SetFormat( const int format )
+void wxDate::SetFormat( int format )
{
DisplayFormat = format;
}
-int wxDate::SetOption( const int option, const bool action )
+int wxDate::SetOption( int option, bool action )
{
switch ( option )
{
}
// This function is from NIHCL
-wxDate wxDate::Previous(const int dayOfWeek) const
+wxDate wxDate::Previous(int dayOfWeek) const
{
int this_day_Of_Week, desired_day_Of_Week;
long j;
if (!m_ostream)
return;
- Write32(tmp_string.Length());
- m_ostream->write((const char *) tmp_string, tmp_string.Length());
+ Write32(string.Length());
+ m_ostream->write((const char *) string, string.Length());
}
// Must be at global scope for VC++ 5
END_EVENT_TABLE()
wxDocChildFrame::wxDocChildFrame(wxDocument *doc, wxView *view, wxFrame *frame, const wxString& title,
- const wxPoint& pos, const wxSize& size, const long style, const wxString& name):
+ const wxPoint& pos, const wxSize& size, long style, const wxString& name):
wxFrame(frame, -1, title, pos, size, style, name)
{
m_childDocument = doc;
return TRUE;
}
-/*
-// Intercept menu commands
-void wxDocChildFrame::OldOnMenuCommand(int id)
-{
- if (m_childView)
- m_childView->Activate(TRUE);
-
- if (GetParent())
- ((wxFrame *)GetParent())->OldOnMenuCommand(id);
-}
-*/
-
void wxDocChildFrame::OnActivate(wxActivateEvent& event)
{
wxFrame::OnActivate(event);
END_EVENT_TABLE()
wxDocParentFrame::wxDocParentFrame(wxDocManager *manager, wxFrame *frame, const wxString& title,
- const wxPoint& pos, const wxSize& size, const long style, const wxString& name):
+ const wxPoint& pos, const wxSize& size, long style, const wxString& name):
wxFrame(frame, -1, title, pos, size, style, name)
{
m_docManager = manager;
return TRUE;
}
-/*
-// Intercept menu commands
-void wxDocParentFrame::OldOnMenuCommand(int id)
-{
- switch (id)
- {
- case wxID_EXIT:
- {
- Close();
- break;
- }
- case wxID_FILE1:
- case wxID_FILE2:
- case wxID_FILE3:
- case wxID_FILE4:
- case wxID_FILE5:
- case wxID_FILE6:
- case wxID_FILE7:
- case wxID_FILE8:
- case wxID_FILE9:
- {
- wxString f(m_docManager->GetHistoryFile(id-wxID_FILE1));
- if (f != "")
- (void)m_docManager->CreateDocument(f, wxDOC_SILENT);
- break;
- }
- default:
- {
- m_docManager->OldOnMenuCommand(id);
- }
- }
-}
-*/
-
// Define the behaviour for the frame closing
// - must delete all frames except for the main one.
bool wxDocParentFrame::OnClose(void)
return FALSE;
}
-void wxEvtHandler::Connect( const int id, const int lastId,
- const int eventType,
+void wxEvtHandler::Connect( int id, int lastId,
+ int eventType,
wxObjectEventFunction func,
wxObject *userData )
{
return FALSE;
};
+/*
#if WXWIN_COMPATIBILITY
void wxEvtHandler::OldOnMenuCommand(int cmd)
{
if (GetNextHandler()) GetNextHandler()->OldOnDropFiles(n, files, x, y);
}
#endif
+*/
bool wxEvtHandler::OnClose(void)
{
x = 0; y = 0; width = 0; height = 0;
}
-wxRect::wxRect(const long xx, const long yy, const long w, const long h)
+wxRect::wxRect(long xx, long yy, long w, long h)
{
x = xx; y = yy; width = w; height = h;
}
DeleteObject (pen);
}
-wxPen *wxPenList::FindOrCreatePen (const wxColour& colour, const int width, const int style)
+wxPen *wxPenList::FindOrCreatePen (const wxColour& colour, int width, int style)
{
for (wxNode * node = First (); node; node = node->Next ())
{
return pen;
}
-wxPen *wxPenList::FindOrCreatePen (const wxString& colour, const int width, const int style)
+wxPen *wxPenList::FindOrCreatePen (const wxString& colour, int width, int style)
{
wxColour *the_colour = wxTheColourDatabase->FindColour (colour);
if (the_colour)
Append (brush);
}
-wxBrush *wxBrushList::FindOrCreateBrush (const wxColour& colour, const int style)
+wxBrush *wxBrushList::FindOrCreateBrush (const wxColour& colour, int style)
{
for (wxNode * node = First (); node; node = node->Next ())
{
return brush;
}
-wxBrush *wxBrushList::FindOrCreateBrush (const wxString& colour, const int style)
+wxBrush *wxBrushList::FindOrCreateBrush (const wxString& colour, int style)
{
wxColour *the_colour = wxTheColourDatabase->FindColour (colour);
if (the_colour)
}
wxFont *wxFontList::
- FindOrCreateFont (const int PointSize, const int FamilyOrFontId, const int Style, const int Weight, const bool underline, const wxString& Face)
+ FindOrCreateFont (int PointSize, int FamilyOrFontId, int Style, int Weight, bool underline, const wxString& Face)
{
for (wxNode * node = First (); node; node = node->Next ())
{
IMPLEMENT_DYNAMIC_CLASS(wxHashTable, wxObject)
#endif
-wxHashTable::wxHashTable (const int the_key_type, const int size)
+wxHashTable::wxHashTable (int the_key_type, int size)
{
n = size;
current_position = -1;
delete[] hash_table;
}
-bool wxHashTable::Create(const int the_key_type, const int size)
+bool wxHashTable::Create(int the_key_type, int size)
{
n = size;
current_position = -1;
return TRUE;
}
-void wxHashTable::Put (const long key, const long value, wxObject * object)
+void wxHashTable::Put (long key, long value, wxObject * object)
{
// Should NEVER be
long k = (long) key;
hash_table[position]->Append (value, object);
}
-void wxHashTable::Put (const long key, const char *value, wxObject * object)
+void wxHashTable::Put (long key, const char *value, wxObject * object)
{
// Should NEVER be
long k = (long) key;
hash_table[position]->Append (value, object);
}
-void wxHashTable::Put (const long key, wxObject * object)
+void wxHashTable::Put (long key, wxObject * object)
{
// Should NEVER be
long k = (long) key;
hash_table[position]->Append (key, object);
}
-wxObject *wxHashTable::Get (const long key, const long value) const
+wxObject *wxHashTable::Get (long key, long value) const
{
// Should NEVER be
long k = (long) key;
}
}
-wxObject *wxHashTable::Get (const long key, const char *value) const
+wxObject *wxHashTable::Get (long key, const char *value) const
{
// Should NEVER be
long k = (long) key;
}
}
-wxObject *wxHashTable::Get (const long key) const
+wxObject *wxHashTable::Get (long key) const
{
// Should NEVER be
long k = (long) key;
}
}
-wxObject *wxHashTable::Delete (const long key)
+wxObject *wxHashTable::Delete (long key)
{
// Should NEVER be
long k = (long) key;
}
}
-wxObject *wxHashTable::Delete (const long key, const int value)
+wxObject *wxHashTable::Delete (long key, int value)
{
// Should NEVER be
long k = (long) key;
}
}
-wxObject *wxHashTable::Delete (const long key, const char *value)
+wxObject *wxHashTable::Delete (long key, const char *value)
{
int position = (int) (key % n);
if (!hash_table[position])
return found;
}
-void wxHashTable::DeleteContents (const bool flag)
+void wxHashTable::DeleteContents (bool flag)
{
int i;
for (i = 0; i < n; i++)
GetChildren()->DeleteObject(child);
}
-void wxSizer::SetSize(const int x, const int y, const int w, const int h, const int WXUNUSED(flags))
+void wxSizer::SetSize(int x, int y, int w, int h, int WXUNUSED(flags))
{
wxLayoutConstraints *constr = GetConstraints();
if (x != -1)
}
}
-void wxSizer::Move(const int x, const int y)
+void wxSizer::Move(int x, int y)
{
wxLayoutConstraints *constr = GetConstraints();
if (x != -1)
{
}
-void wxRowColSizer::SetSize(const int x, const int y, const int w, const int h, const int flags)
+void wxRowColSizer::SetSize(int x, int y, int w, int h, int flags)
{
wxSizer::SetSize(x, y, w, h, flags);
}
key_type = wxKEY_NONE;
}
-wxList::wxList (const int N, wxObject * Objects[])
+wxList::wxList (int N, wxObject * Objects[])
{
wxNode *last = NULL;
return node;
}
-wxNode *wxList::Nth (const int i) const
+wxNode *wxList::Nth (int i) const
{
int j = 0;
for (wxNode * current = First (); current; current = current->Next ())
}
-wxNode *wxList::Find (const long key) const
+wxNode *wxList::Find (long key) const
{
wxNode *current = First();
while (current)
}
// Keyed append
-wxNode *wxList::Append (const long key, wxObject * object)
+wxNode *wxList::Append (long key, wxObject * object)
{
wxNode *node = new wxNode (this, last_node, NULL, object, key);
if (!first_node)
}
// Only makes new strings if arg is TRUE
-char **wxStringList::ListToArray (const bool new_copies) const
+char **wxStringList::ListToArray (bool new_copies) const
{
char **string_array = new char *[Number ()];
wxNode *node = First ();
IMPLEMENT_CLASS(wxPostScriptPrintDialog, wxDialog)
wxPostScriptPrintDialog::wxPostScriptPrintDialog (wxWindow *parent, const wxString& title,
- const wxPoint& pos, const wxSize& size, const long style):
+ const wxPoint& pos, const wxSize& size, long style):
wxDialog(parent, -1, title, pos, size, style)
{
wxBeginBusyCursor();
node = node->Next();
}
}
- control = new wxRadioBox(parent, (const wxWindowID) id, wxString(childResource->GetTitle()),
+ control = new wxRadioBox(parent, (wxWindowID) id, wxString(childResource->GetTitle()),
wxPoint(childResource->GetX(), childResource->GetY()),
wxSize(childResource->GetWidth(), childResource->GetHeight()),
noStrings, strings, (int)childResource->GetValue1(), childResource->GetStyle(), wxDefaultValidator,
// is still valid: a tool may have quit the toolbar.
static wxList gs_ToolBars;
-wxToolBarTool::wxToolBarTool(const int theIndex,
- const wxBitmap& theBitmap1, const wxBitmap& theBitmap2, const bool toggle,
- const long xPos, const long yPos, const wxString& helpS1, const wxString& helpS2)
+wxToolBarTool::wxToolBarTool(int theIndex,
+ const wxBitmap& theBitmap1, const wxBitmap& theBitmap2, bool toggle,
+ long xPos, long yPos, const wxString& helpS1, const wxString& helpS2)
{
m_toolStyle = wxTOOL_STYLE_BUTTON;
m_clientData = NULL;
// If pushedBitmap is NULL, a reversed version of bitmap is
// created and used as the pushed/toggled image.
// If toggle is TRUE, the button toggles between the two states.
-wxToolBarTool *wxToolBarBase::AddTool(const int index, const wxBitmap& bitmap, const wxBitmap& pushedBitmap,
- const bool toggle, const long xPos, const long yPos, wxObject *clientData,
+wxToolBarTool *wxToolBarBase::AddTool(int index, const wxBitmap& bitmap, const wxBitmap& pushedBitmap,
+ bool toggle, long xPos, long yPos, wxObject *clientData,
const wxString& helpString1, const wxString& helpString2)
{
wxToolBarTool *tool = new wxToolBarTool(index, bitmap, pushedBitmap, toggle, xPos, yPos, helpString1, helpString2);
}
}
-void wxToolBarBase::EnableTool(const int index, const bool enable)
+void wxToolBarBase::EnableTool(int index, bool enable)
{
wxNode *node = m_tools.Find((long)index);
if (node)
}
}
-void wxToolBarBase::ToggleTool(const int index, const bool toggle)
+void wxToolBarBase::ToggleTool(int index, bool toggle)
{
}
-void wxToolBarBase::SetToggle(const int index, const bool value)
+void wxToolBarBase::SetToggle(int index, bool value)
{
wxNode *node=m_tools.Find((long)index);
if (node){
}
}
-bool wxToolBarBase::GetToolState(const int index) const
+bool wxToolBarBase::GetToolState(int index) const
{
wxNode *node = m_tools.Find((long)index);
if (node)
else return FALSE;
}
-bool wxToolBarBase::GetToolEnabled(const int index) const
+bool wxToolBarBase::GetToolEnabled(int index) const
{
wxNode *node = m_tools.Find((long)index);
if (node)
else return FALSE;
}
-wxObject *wxToolBarBase::GetToolClientData(const int index) const
+wxObject *wxToolBarBase::GetToolClientData(int index) const
{
wxNode *node = m_tools.Find((long)index);
if (node)
else return NULL;
}
-void wxToolBarBase::SetToolShortHelp(const int index, const wxString& helpString)
+void wxToolBarBase::SetToolShortHelp(int index, const wxString& helpString)
{
wxNode *node=m_tools.Find((long)index);
if (node)
}
}
-wxString wxToolBarBase::GetToolShortHelp(const int index) const
+wxString wxToolBarBase::GetToolShortHelp(int index) const
{
wxNode *node=m_tools.Find((long)index);
if (node)
return wxString("");
}
-void wxToolBarBase::SetToolLongHelp(const int index, const wxString& helpString)
+void wxToolBarBase::SetToolLongHelp(int index, const wxString& helpString)
{
wxNode *node=m_tools.Find((long)index);
if (node)
}
}
-wxString wxToolBarBase::GetToolLongHelp(const int index) const
+wxString wxToolBarBase::GetToolLongHelp(int index) const
{
wxNode *node=m_tools.Find((long)index);
if (node)
return wxString("");
}
-wxToolBarTool *wxToolBarBase::FindToolForPosition(const long x, const long y) const
+wxToolBarTool *wxToolBarBase::FindToolForPosition(long x, long y) const
{
wxNode *node = m_tools.First();
while (node)
// the tool we're leaving was a 'sprung push button' and if so,
// spring it back to the up state.
//
-void wxToolBarBase::SetMargins(const int x, const int y)
+void wxToolBarBase::SetMargins(int x, int y)
{
m_xMargin = x;
m_yMargin = y;
}
-void wxToolBarBase::SetToolPacking(const int packing)
+void wxToolBarBase::SetToolPacking(int packing)
{
m_toolPacking = packing;
}
-void wxToolBarBase::SetToolSeparation(const int separation)
+void wxToolBarBase::SetToolSeparation(int separation)
{
m_toolSeparation = separation;
}
* pixelsPerUnitX/pixelsPerUnitY: number of pixels per unit (e.g. pixels per text line)
* noUnitsX/noUnitsY: : no. units per scrollbar
*/
-void wxToolBarBase::SetScrollbars (const int pixelsPerUnitX, const int pixelsPerUnitY,
- const int noUnitsX, const int noUnitsY,
- const int xPos, const int yPos)
+void wxToolBarBase::SetScrollbars (int pixelsPerUnitX, int pixelsPerUnitY,
+ int noUnitsX, int noUnitsY,
+ int xPos, int yPos)
{
m_xScrollPixelsPerLine = pixelsPerUnitX;
m_yScrollPixelsPerLine = pixelsPerUnitY;
/*
* Scroll to given position (scroll position, not pixel position)
*/
-void wxToolBarBase::Scroll (const int x_pos, const int y_pos)
+void wxToolBarBase::Scroll (int x_pos, int y_pos)
{
int old_x, old_y;
ViewStart (&old_x, &old_y);
#endif
}
-void wxToolBarBase::EnableScrolling (const bool x_scroll, const bool y_scroll)
+void wxToolBarBase::EnableScrolling (bool x_scroll, bool y_scroll)
{
m_xScrollingEnabled = x_scroll;
m_yScrollingEnabled = y_scroll;
}
/*
-void wxToolBarBase::CalcScrolledPosition(const int x, const int y, int *xx, int *yy) const
+void wxToolBarBase::CalcScrolledPosition(int x, int y, int *xx, int *yy) const
{
*xx = (m_calcScrolledOffset ? (x - m_xScrollPosition * m_xScrollPixelsPerLine) : x);
*yy = (m_calcScrolledOffset ? (y - m_yScrollPosition * m_yScrollPixelsPerLine) : y);
}
-void wxToolBarBase::CalcUnscrolledPosition(const int x, const int y, float *xx, float *yy) const
+void wxToolBarBase::CalcUnscrolledPosition(int x, int y, float *xx, float *yy) const
{
*xx = (float)(m_calcScrolledOffset ? (x + m_xScrollPosition * m_xScrollPixelsPerLine) : x);
*yy = (float)(m_calcScrolledOffset ? (y + m_yScrollPosition * m_yScrollPixelsPerLine) : y);
#ifdef __WINDOWS__
// Circumvent wxControl::MSWOnMouseMove which doesn't set the cursor.
-void wxToolBarBase::MSWOnMouseMove(const int x, const int y, const WXUINT flags)
+void wxToolBarBase::MSWOnMouseMove(int x, int y, const WXUINT flags)
{
wxWindow::MSWOnMouseMove(x, y, flags);
}
{
}
-bool wxToolBarSimple::Create(wxWindow *parent, const wxWindowID id, const wxPoint& pos, const wxSize& size, const long style,
- const int direction, const int RowsOrColumns, const wxString& name )
+bool wxToolBarSimple::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style,
+ int direction, int RowsOrColumns, const wxString& name )
{
if ( ! wxWindow::Create(parent, id, pos, size, style, name) )
return FALSE;
}
}
-void wxToolBarSimple::ToggleTool(const int index, const bool toggle)
+void wxToolBarSimple::ToggleTool(int index, bool toggle)
{
wxNode *node = m_tools.Find((long)index);
if (node)
// the tool we're leaving was a 'sprung push button' and if so,
// spring it back to the up state.
//
-void wxToolBarSimple::SpringUpButton(const int index)
+void wxToolBarSimple::SpringUpButton(int index)
{
wxNode *node=m_tools.Find((long)index);
if (node) {
END_EVENT_TABLE()
#endif
-wxTextValidator::wxTextValidator(const long style, wxString *val)
+wxTextValidator::wxTextValidator(long style, wxString *val)
{
m_validatorStyle = style ;
m_stringValue = val ;
extern void wxSplitMessage2(const char *message, wxList *messageList, wxWindow *parent, wxRowColSizer *sizer);
-wxString wxGetSingleChoice( const wxString& message, const wxString& caption, const int n,
- const wxString *choices, wxWindow *parent,
- const int WXUNUSED(x), const int WXUNUSED(y), const bool WXUNUSED(centre),
- const int WXUNUSED(width), const int WXUNUSED(height) )
+wxString wxGetSingleChoice( const wxString& message, const wxString& caption, int n,
+ const wxString *choices, wxWindow *parent,
+ int WXUNUSED(x), int WXUNUSED(y), bool WXUNUSED(centre),
+ int WXUNUSED(width), int WXUNUSED(height) )
{
wxSingleChoiceDialog dialog(parent, message, caption, n, choices);
if ( dialog.ShowModal() == wxID_OK )
}
// Overloaded for backward compatibility
-wxString wxGetSingleChoice( const wxString& message, const wxString& caption, const int n,
- char *choices[], wxWindow *parent,
- const int x, const int y, const bool centre,
- const int width, const int height )
+wxString wxGetSingleChoice( const wxString& message, const wxString& caption, int n,
+ char *choices[], wxWindow *parent,
+ int x, int y, bool centre,
+ int width, int height )
{
wxString *strings = new wxString[n];
int i;
return ans;
}
-int wxGetSingleChoiceIndex( const wxString& message, const wxString& caption, const int n,
- const wxString *choices, wxWindow *parent,
- const int WXUNUSED(x), const int WXUNUSED(y), const bool WXUNUSED(centre),
- const int WXUNUSED(width), const int WXUNUSED(height) )
+int wxGetSingleChoiceIndex( const wxString& message, const wxString& caption, int n,
+ const wxString *choices, wxWindow *parent,
+ int WXUNUSED(x), int WXUNUSED(y), bool WXUNUSED(centre),
+ int WXUNUSED(width), int WXUNUSED(height) )
{
wxSingleChoiceDialog dialog(parent, message, caption, n, choices);
if ( dialog.ShowModal() == wxID_OK )
}
// Overloaded for backward compatibility
-int wxGetSingleChoiceIndex( const wxString& message, const wxString& caption, const int n,
- char *choices[], wxWindow *parent,
- const int x, const int y, const bool centre,
- const int width, const int height )
+int wxGetSingleChoiceIndex( const wxString& message, const wxString& caption, int n,
+ char *choices[], wxWindow *parent,
+ int x, int y, bool centre,
+ int width, int height )
{
wxString *strings = new wxString[n];
int i;
return ans;
}
-char *wxGetSingleChoiceData( const wxString& message, const wxString& caption, const int n,
- const wxString *choices, char **client_data, wxWindow *parent,
- const int WXUNUSED(x), const int WXUNUSED(y), const bool WXUNUSED(centre),
- const int WXUNUSED(width), const int WXUNUSED(height) )
+char *wxGetSingleChoiceData( const wxString& message, const wxString& caption, int n,
+ const wxString *choices, char **client_data, wxWindow *parent,
+ int WXUNUSED(x), int WXUNUSED(y), bool WXUNUSED(centre),
+ int WXUNUSED(width), int WXUNUSED(height) )
{
wxSingleChoiceDialog dialog(parent, message, caption, n, choices, client_data);
if ( dialog.ShowModal() == wxID_OK )
}
// Overloaded for backward compatibility
-char *wxGetSingleChoiceData( const wxString& message, const wxString& caption, const int n,
- char *choices[], char **client_data, wxWindow *parent,
- const int x, const int y, const bool centre,
- const int width, const int height )
+char *wxGetSingleChoiceData( const wxString& message, const wxString& caption, int n,
+ char *choices[], char **client_data, wxWindow *parent,
+ int x, int y, bool centre,
+ int width, int height )
{
wxString *strings = new wxString[n];
int i;
*/
/*
int wxGetMultipleChoice(const wxString& message, const wxString& caption,
- const int n, const wxString *choices,
- const int nsel, int * selection,
- wxWindow *parent , const int x , const int y, const bool centre,
- const int width, const int height)
+ int n, const wxString *choices,
+ int nsel, int * selection,
+ wxWindow *parent , int x , int y, bool centre,
+ int width, int height)
{
return -1;
}
#if !USE_SHARED_LIBRARY
BEGIN_EVENT_TABLE(wxSingleChoiceDialog, wxDialog)
EVT_BUTTON(wxID_OK, wxSingleChoiceDialog::OnOK)
+ EVT_LISTBOX_DCLICK(wxID_LISTBOX, wxSingleChoiceDialog::OnListBoxDClick)
END_EVENT_TABLE()
IMPLEMENT_CLASS(wxSingleChoiceDialog, wxDialog)
#endif
wxSingleChoiceDialog::wxSingleChoiceDialog(wxWindow *parent, const wxString& message, const wxString& caption,
- const int n, const wxString *choices, char **clientData, long style, const wxPoint& pos):
+ int n, const wxString *choices, char **clientData, long style, const wxPoint& pos):
wxDialog(parent, -1, caption, pos, wxDefaultSize, wxDEFAULT_DIALOG_STYLE|wxDIALOG_MODAL)
{
Create(parent, message, caption, n, choices, clientData, style);
}
bool wxSingleChoiceDialog::Create( wxWindow *WXUNUSED(parent), const wxString& message,
- const wxString& WXUNUSED(caption), const int n,
- const wxString *choices, char **clientData, long style,
+ const wxString& WXUNUSED(caption), int n,
+ const wxString *choices, char **clientData, long style,
const wxPoint& WXUNUSED(pos) )
{
m_dialogStyle = style;
EndModal(wxID_OK);
}
+void wxSingleChoiceDialog::OnListBoxDClick(wxCommandEvent& WXUNUSED(event))
+{
+ wxListBox *listBox = (wxListBox *)FindWindow(wxID_LISTBOX);
+ if ( listBox )
+ {
+ m_selection = listBox->GetSelection();
+ m_stringSelection = listBox->GetStringSelection();
+ m_clientData = listBox->GetClientData(m_selection);
+ }
+
+ EndModal(wxID_OK);
+}
+
bool wxImageList::Draw( int index, wxDC &dc,
int x, int y,
- int WXUNUSED(flags), const bool WXUNUSED(solidBackground) )
+ int WXUNUSED(flags), bool WXUNUSED(solidBackground) )
{
wxNode *node = m_images.Nth( index );
if (!node) return FALSE;
m_text = s;
};
-void wxListItemData::SetImage( const int image )
+void wxListItemData::SetImage( int image )
{
m_image = image;
};
-void wxListItemData::SetData( const long data )
+void wxListItemData::SetData( long data )
{
m_data = data;
};
-void wxListItemData::SetPosition( const int x, const int y )
+void wxListItemData::SetPosition( int x, int y )
{
m_xpos = x;
m_ypos = y;
};
-void wxListItemData::SetSize( int const width, const int height )
+void wxListItemData::SetSize( int const width, int height )
{
m_width = width;
m_height = height;
return (!m_text.IsNull());
};
-bool wxListItemData::IsHit( const int x, const int y ) const
+bool wxListItemData::IsHit( int x, int y ) const
{
return ((x >= m_xpos) && (x <= m_xpos+m_width) && (y >= m_ypos) && (y <= m_ypos+m_height));
};
if (m_width < 6) m_width = 6;
};
-void wxListHeaderData::SetPosition( const int x, const int y )
+void wxListHeaderData::SetPosition( int x, int y )
{
m_xpos = x;
m_ypos = y;
};
-void wxListHeaderData::SetHeight( const int h )
+void wxListHeaderData::SetHeight( int h )
{
m_height = h;
};
-void wxListHeaderData::SetWidth( const int w )
+void wxListHeaderData::SetWidth( int w )
{
m_width = w;
if (m_width < 0) m_width = 80;
if (m_width < 6) m_width = 6;
};
-void wxListHeaderData::SetFormat( const int format )
+void wxListHeaderData::SetFormat( int format )
{
m_format = format;
};
IMPLEMENT_DYNAMIC_CLASS(wxListLineData,wxObject);
-wxListLineData::wxListLineData( wxListMainWindow *owner, const int mode, wxBrush *hilightBrush )
+wxListLineData::wxListLineData( wxListMainWindow *owner, int mode, wxBrush *hilightBrush )
{
m_mode = mode;
m_hilighted = FALSE;
m_spacing = 0;
};
-void wxListLineData::CalculateSize( wxPaintDC *dc, const int spacing )
+void wxListLineData::CalculateSize( wxPaintDC *dc, int spacing )
{
m_spacing = spacing;
switch (m_mode)
};
};
-void wxListLineData::SetPosition( wxPaintDC *dc, const int x, const int y, const int window_width )
+void wxListLineData::SetPosition( wxPaintDC *dc, int x, int y, int window_width )
{
m_bound_all.x = x;
m_bound_all.y = y;
};
};
-void wxListLineData::SetColumnPosition( const int index, const int x )
+void wxListLineData::SetColumnPosition( int index, int x )
{
int i = index;
wxNode *node = m_items.Nth( i );
AssignRect( rect, m_bound_all );
};
-long wxListLineData::IsHit( const int x, const int y )
+long wxListLineData::IsHit( int x, int y )
{
wxNode *node = m_items.First();
if (node)
return 0;
};
-void wxListLineData::InitItems( const int num )
+void wxListLineData::InitItems( int num )
{
for (int i = 0; i < num; i++) m_items.Append( new wxListItemData() );
};
-void wxListLineData::SetItem( const int index, const wxListItem &info )
+void wxListLineData::SetItem( int index, const wxListItem &info )
{
wxNode *node = m_items.Nth( index );
if (node)
};
};
-void wxListLineData::GetText( const int index, wxString &s )
+void wxListLineData::GetText( int index, wxString &s )
{
int i = index;
wxNode *node = m_items.Nth( i );
};
};
-void wxListLineData::SetText( const int index, const wxString s )
+void wxListLineData::SetText( int index, const wxString s )
{
int i = index;
wxNode *node = m_items.Nth( i );
};
};
-int wxListLineData::GetImage( const int index )
+int wxListLineData::GetImage( int index )
{
int i = index;
wxNode *node = m_items.Nth( i );
return -1;
};
-void wxListLineData::DoDraw( wxPaintDC *dc, const bool hilight, const bool paintBG )
+void wxListLineData::DoDraw( wxPaintDC *dc, bool hilight, bool paintBG )
{
long dev_x = dc->LogicalToDeviceX( m_bound_all.x-2 );
long dev_y = dc->LogicalToDeviceY( m_bound_all.y-2 );
};
};
-void wxListLineData::Hilight( const bool on )
+void wxListLineData::Hilight( bool on )
{
if (on == m_hilighted) return;
if (on)
m_owner->DeselectLine( this );
};
-void wxListLineData::DrawRubberBand( wxPaintDC *dc, const bool on )
+void wxListLineData::DrawRubberBand( wxPaintDC *dc, bool on )
{
if (on)
{
DoDraw( dc, m_hilighted, m_hilighted );
};
-bool wxListLineData::IsInRect( const int x, const int y, const wxRectangle &rect )
+bool wxListLineData::IsInRect( int x, int y, const wxRectangle &rect )
{
return ((x >= rect.x) && (x <= rect.x+rect.width) && (y >= rect.y) && (y <= rect.y+rect.height));
};
return m_hilighted;
};
-void wxListLineData::AssignRect( wxRectangle &dest, const int x, const int y, const int width, const int height )
+void wxListLineData::AssignRect( wxRectangle &dest, int x, int y, int width, int height )
{
dest.x = x;
dest.y = y;
m_resizeCursor = NULL;
};
-wxListHeaderWindow::wxListHeaderWindow( wxWindow *win, const wxWindowID id, wxListMainWindow *owner,
- const wxPoint &pos, const wxSize &size,
- const long style, const wxString &name ) :
+wxListHeaderWindow::wxListHeaderWindow( wxWindow *win, wxWindowID id, wxListMainWindow *owner,
+ const wxPoint &pos, const wxSize &size,
+ long style, const wxString &name ) :
wxWindow( win, id, pos, size, style, name )
{
m_owner = owner;
m_isDragging = FALSE;
};
-wxListMainWindow::wxListMainWindow( wxWindow *parent, const wxWindowID id,
+wxListMainWindow::wxListMainWindow( wxWindow *parent, wxWindowID id,
const wxPoint &pos, const wxSize &size,
- const long style, const wxString &name ) :
- wxScrolledWindow( parent, id, pos, size, style, name )
+ long style, const wxString &name ) :
+ wxScrolledWindow( parent, id, pos, size, style, name )
{
m_mode = style;
m_lines.DeleteContents( TRUE );
dc.EndDrawing();
};
-void wxListMainWindow::HilightAll( const bool on )
+void wxListMainWindow::HilightAll( bool on )
{
wxNode *node = m_lines.First();
while (node)
return -1;
};
-void wxListMainWindow::SetImageList( wxImageList *imageList, const int which )
+void wxListMainWindow::SetImageList( wxImageList *imageList, int which )
{
m_dirty = TRUE;
if (which == wxIMAGE_LIST_NORMAL) m_normal_image_list = imageList;
if (which == wxIMAGE_LIST_SMALL) m_small_image_list = imageList;
};
-void wxListMainWindow::SetItemSpacing( const int spacing, const bool isSmall )
+void wxListMainWindow::SetItemSpacing( int spacing, bool isSmall )
{
m_dirty = TRUE;
if (isSmall)
};
};
-int wxListMainWindow::GetItemSpacing( const bool isSmall )
+int wxListMainWindow::GetItemSpacing( bool isSmall )
{
if (isSmall) return m_small_spacing; else return m_normal_spacing;
};
-void wxListMainWindow::SetColumn( const int col, wxListItem &item )
+void wxListMainWindow::SetColumn( int col, wxListItem &item )
{
m_dirty = TRUE;
wxNode *node = m_columns.Nth( col );
};
};
-void wxListMainWindow::SetColumnWidth( const int col, const int width )
+void wxListMainWindow::SetColumnWidth( int col, int width )
{
m_dirty = TRUE;
wxNode *node = m_columns.Nth( col );
};
};
-void wxListMainWindow::GetColumn( const int col, wxListItem &item )
+void wxListMainWindow::GetColumn( int col, wxListItem &item )
{
wxNode *node = m_columns.Nth( col );
if (node)
};
};
-int wxListMainWindow::GetColumnWidth( const int col )
+int wxListMainWindow::GetColumnWidth( int col )
{
wxNode *node = m_columns.Nth( col );
if (node)
};
};
-void wxListMainWindow::SetItemState( const long item, const long state, const long stateMask )
+void wxListMainWindow::SetItemState( long item, long state, long stateMask )
{
// m_dirty = TRUE; no recalcs needed
wxListLineData *oldCurrent = m_current;
};
};
-int wxListMainWindow::GetItemState( const long item, const long stateMask )
+int wxListMainWindow::GetItemState( long item, long stateMask )
{
int ret = wxLIST_STATE_DONTCARE;
if (stateMask & wxLIST_STATE_FOCUSED)
return m_lines.Number();
};
-void wxListMainWindow::GetItemRect( const long index, wxRectangle &rect )
+void wxListMainWindow::GetItemRect( long index, wxRectangle &rect )
{
wxNode *node = m_lines.Nth( index );
if (node)
return 0;
};
-void wxListMainWindow::SetMode( const long mode )
+void wxListMainWindow::SetMode( long mode )
{
m_dirty = TRUE;
m_mode = mode;
};
};
-long wxListMainWindow::GetNextItem( const long item, int WXUNUSED(geometry), int state )
+long wxListMainWindow::GetNextItem( long item, int WXUNUSED(geometry), int state )
{
long ret = 0;
if (item > 0) ret = item;
return -1;
};
-void wxListMainWindow::DeleteItem( const long index )
+void wxListMainWindow::DeleteItem( long index )
{
m_dirty = TRUE;
wxNode *node = m_lines.Nth( index );
};
};
-void wxListMainWindow::DeleteColumn( const int col )
+void wxListMainWindow::DeleteColumn( int col )
{
m_dirty = TRUE;
wxNode *node = m_columns.Nth( col );
m_columns.Clear();
};
-void wxListMainWindow::EnsureVisible( const long index )
+void wxListMainWindow::EnsureVisible( long index )
{
wxListLineData *oldCurrent = m_current;
m_current = NULL;
m_current = oldCurrent;
};
-long wxListMainWindow::FindItem(const long start, const wxString& str, const bool WXUNUSED(partial) )
+long wxListMainWindow::FindItem(long start, const wxString& str, bool WXUNUSED(partial) )
{
long pos = start;
wxString tmp = str;
return -1;
};
-long wxListMainWindow::FindItem(const long start, const long data)
+long wxListMainWindow::FindItem(long start, long data)
{
long pos = start;
if (pos < 0) pos = 0;
return -1;
};
-long wxListMainWindow::HitTest( const int x, const int y, int &flags )
+long wxListMainWindow::HitTest( int x, int y, int &flags )
{
wxNode *node = m_lines.First();
int count = 0;
m_lines.Append( line );
};
-void wxListMainWindow::InsertColumn( const long col, wxListItem &item )
+void wxListMainWindow::InsertColumn( long col, wxListItem &item )
{
m_dirty = TRUE;
if (m_mode & wxLC_REPORT)
m_imageListState = NULL;
}
-wxListCtrl::wxListCtrl( wxWindow *parent, const wxWindowID id,
- const wxPoint &pos, const wxSize &size,
- const long style, const wxString &name )
+wxListCtrl::wxListCtrl( wxWindow *parent, wxWindowID id,
+ const wxPoint &pos, const wxSize &size,
+ long style, const wxString &name )
{
Create( parent, id, pos, size, style, name );
{
}
-bool wxListCtrl::Create( wxWindow *parent, const wxWindowID id,
- const wxPoint &pos, const wxSize &size,
- const long style, const wxString &name )
+bool wxListCtrl::Create( wxWindow *parent, wxWindowID id,
+ const wxPoint &pos, const wxSize &size,
+ long style, const wxString &name )
{
m_imageListNormal = NULL;
m_imageListSmall = NULL;
if (m_mainWin) m_mainWin->m_dirty = TRUE;
};
-void wxListCtrl::SetSingleStyle( const long style, const bool add )
+void wxListCtrl::SetSingleStyle( long style, bool add )
{
long flag = GetWindowStyleFlag();
SetWindowStyleFlag( flag );
};
-void wxListCtrl::SetWindowStyleFlag( const long flag )
+void wxListCtrl::SetWindowStyleFlag( long flag )
{
m_mainWin->DeleteEverything();
wxWindow::SetBackgroundColour( (wxColour&)col );
};
-bool wxListCtrl::GetColumn(const int col, wxListItem &item)
+bool wxListCtrl::GetColumn(int col, wxListItem &item)
{
m_mainWin->GetColumn( col, item );
return TRUE;
};
-bool wxListCtrl::SetColumn( const int col, wxListItem& item )
+bool wxListCtrl::SetColumn( int col, wxListItem& item )
{
m_mainWin->SetColumn( col, item );
return TRUE;
};
-int wxListCtrl::GetColumnWidth( const int col )
+int wxListCtrl::GetColumnWidth( int col )
{
return m_mainWin->GetColumnWidth( col );
};
-bool wxListCtrl::SetColumnWidth( const int col, const int width )
+bool wxListCtrl::SetColumnWidth( int col, int width )
{
m_mainWin->SetColumnWidth( col, width );
return TRUE;
return TRUE;
};
-long wxListCtrl::SetItem( const long index, const int col, const wxString& label, const int imageId )
+long wxListCtrl::SetItem( long index, int col, const wxString& label, int imageId )
{
wxListItem info;
info.m_text = label;
return TRUE;
};
-int wxListCtrl::GetItemState( const long item, const long stateMask )
+int wxListCtrl::GetItemState( long item, long stateMask )
{
return m_mainWin->GetItemState( item, stateMask );
};
-bool wxListCtrl::SetItemState( const long item, const long state, const long stateMask )
+bool wxListCtrl::SetItemState( long item, long state, long stateMask )
{
m_mainWin->SetItemState( item, state, stateMask );
return TRUE;
};
-bool wxListCtrl::SetItemImage( const long item, const int image, const int WXUNUSED(selImage) )
+bool wxListCtrl::SetItemImage( long item, int image, int WXUNUSED(selImage) )
{
wxListItem info;
info.m_image = image;
return TRUE;
};
-wxString wxListCtrl::GetItemText( const long item )
+wxString wxListCtrl::GetItemText( long item )
{
wxListItem info;
info.m_itemId = item;
return info.m_text;
};
-void wxListCtrl::SetItemText( const long item, const wxString &str )
+void wxListCtrl::SetItemText( long item, const wxString &str )
{
wxListItem info;
info.m_mask = wxLIST_MASK_TEXT;
m_mainWin->SetItem( info );
};
-long wxListCtrl::GetItemData( const long item )
+long wxListCtrl::GetItemData( long item )
{
wxListItem info;
info.m_itemId = item;
return info.m_data;
};
-bool wxListCtrl::SetItemData( const long item, long data )
+bool wxListCtrl::SetItemData( long item, long data )
{
wxListItem info;
info.m_mask = wxLIST_MASK_DATA;
return TRUE;
};
-bool wxListCtrl::GetItemRect( const long item, wxRectangle &rect, const int WXUNUSED(code) )
+bool wxListCtrl::GetItemRect( long item, wxRectangle &rect, int WXUNUSED(code) )
{
m_mainWin->GetItemRect( item, rect );
return TRUE;
};
-bool wxListCtrl::GetItemPosition( const long WXUNUSED(item), wxPoint& WXUNUSED(pos) ) const
+bool wxListCtrl::GetItemPosition( long WXUNUSED(item), wxPoint& WXUNUSED(pos) ) const
{
return 0;
};
-bool wxListCtrl::SetItemPosition( const long WXUNUSED(item), const wxPoint& WXUNUSED(pos) )
+bool wxListCtrl::SetItemPosition( long WXUNUSED(item), const wxPoint& WXUNUSED(pos) )
{
return 0;
};
return 0;
};
-long wxListCtrl::GetNextItem( const long item, int geom, int state )
+long wxListCtrl::GetNextItem( long item, int geom, int state )
{
return m_mainWin->GetNextItem( item, geom, state );
};
-wxImageList *wxListCtrl::GetImageList(const int which)
+wxImageList *wxListCtrl::GetImageList(int which)
{
if (which == wxIMAGE_LIST_NORMAL)
{
return NULL;
};
-void wxListCtrl::SetImageList( wxImageList *imageList, const int which )
+void wxListCtrl::SetImageList( wxImageList *imageList, int which )
{
m_mainWin->SetImageList( imageList, which );
};
-bool wxListCtrl::Arrange( const int WXUNUSED(flag) )
+bool wxListCtrl::Arrange( int WXUNUSED(flag) )
{
return 0;
};
-bool wxListCtrl::DeleteItem( const long item )
+bool wxListCtrl::DeleteItem( long item )
{
m_mainWin->DeleteItem( item );
return TRUE;
return TRUE;
};
-bool wxListCtrl::DeleteColumn( const int col )
+bool wxListCtrl::DeleteColumn( int col )
{
m_mainWin->DeleteColumn( col );
return TRUE;
};
/*
-wxText& wxListCtrl::Edit( const long WXUNUSED(item ) )
+wxText& wxListCtrl::Edit( long WXUNUSED(item ) )
{
};
*/
-bool wxListCtrl::EnsureVisible( const long item )
+bool wxListCtrl::EnsureVisible( long item )
{
m_mainWin->EnsureVisible( item );
return TRUE;
};
-long wxListCtrl::FindItem( const long start, const wxString& str, const bool partial )
+long wxListCtrl::FindItem( long start, const wxString& str, bool partial )
{
return m_mainWin->FindItem( start, str, partial );
};
-long wxListCtrl::FindItem( const long start, const long data )
+long wxListCtrl::FindItem( long start, long data )
{
return m_mainWin->FindItem( start, data );
};
-long wxListCtrl::FindItem( const long WXUNUSED(start), const wxPoint& WXUNUSED(pt),
- const int WXUNUSED(direction))
+long wxListCtrl::FindItem( long WXUNUSED(start), const wxPoint& WXUNUSED(pt),
+ int WXUNUSED(direction))
{
return 0;
};
return 0;
};
-long wxListCtrl::InsertItem( const long index, const wxString &label )
+long wxListCtrl::InsertItem( long index, const wxString &label )
{
wxListItem info;
info.m_text = label;
return InsertItem( info );
};
-long wxListCtrl::InsertItem( const long index, const int imageIndex )
+long wxListCtrl::InsertItem( long index, int imageIndex )
{
wxListItem info;
info.m_mask = wxLIST_MASK_IMAGE;
return InsertItem( info );
};
-long wxListCtrl::InsertItem( const long index, const wxString &label, const int imageIndex )
+long wxListCtrl::InsertItem( long index, const wxString &label, int imageIndex )
{
wxListItem info;
info.m_text = label;
return InsertItem( info );
};
-long wxListCtrl::InsertColumn( const long col, wxListItem &item )
+long wxListCtrl::InsertColumn( long col, wxListItem &item )
{
m_mainWin->InsertColumn( col, item );
return 0;
};
-long wxListCtrl::InsertColumn( const long col, const wxString &heading,
- const int format, const int width )
+long wxListCtrl::InsertColumn( long col, const wxString &heading,
+ int format, int width )
{
wxListItem item;
item.m_mask = wxLIST_MASK_TEXT | wxLIST_MASK_FORMAT;
return InsertColumn( col, item );
};
-bool wxListCtrl::ScrollList( const int WXUNUSED(dx), const int WXUNUSED(dy) )
+bool wxListCtrl::ScrollList( int WXUNUSED(dx), int WXUNUSED(dy) )
{
return 0;
};
}
-int wxMessageBox(const wxString& message, const wxString& caption, const long style,
- wxWindow *parent, const int WXUNUSED(x), const int WXUNUSED(y) )
+int wxMessageBox(const wxString& message, const wxString& caption, long style,
+ wxWindow *parent, int WXUNUSED(x), int WXUNUSED(y) )
{
wxMessageDialog dialog(parent, message, caption, style);
SetDefaultBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
}
-bool wxPanel::Create(wxWindow *parent, const wxWindowID id,
+bool wxPanel::Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos,
const wxSize& size,
- const long style,
+ long style,
const wxString& name)
{
bool ret = wxWindow::Create(parent, id, pos, size, style, name);
m_yScrollLinesPerPage = 0;
}
-bool wxScrolledWindow::Create(wxWindow *parent, const wxWindowID id,
+bool wxScrolledWindow::Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos,
const wxSize& size,
- const long style,
+ long style,
const wxString& name)
{
m_xScrollPixelsPerLine = 0;
* pixelsPerUnitX/pixelsPerUnitY: number of pixels per unit (e.g. pixels per text line)
* noUnitsX/noUnitsY: : no. units per scrollbar
*/
-void wxScrolledWindow::SetScrollbars (const int pixelsPerUnitX, const int pixelsPerUnitY,
- const int noUnitsX, const int noUnitsY,
- const int xPos, const int yPos, const bool noRefresh )
+void wxScrolledWindow::SetScrollbars (int pixelsPerUnitX, int pixelsPerUnitY,
+ int noUnitsX, int noUnitsY,
+ int xPos, int yPos, bool noRefresh )
{
bool do_refresh =
(
/*
* Scroll to given position (scroll position, not pixel position)
*/
-void wxScrolledWindow::Scroll (const int x_pos, const int y_pos)
+void wxScrolledWindow::Scroll (int x_pos, int y_pos)
{
int old_x, old_y;
ViewStart (&old_x, &old_y);
#endif
}
-void wxScrolledWindow::EnableScrolling (const bool x_scroll, const bool y_scroll)
+void wxScrolledWindow::EnableScrolling (bool x_scroll, bool y_scroll)
{
m_xScrollingEnabled = x_scroll;
m_yScrollingEnabled = y_scroll;
*y = m_yScrollPosition;
}
-void wxScrolledWindow::CalcScrolledPosition(const int x, const int y, int *xx, int *yy) const
+void wxScrolledWindow::CalcScrolledPosition(int x, int y, int *xx, int *yy) const
{
*xx = x - m_xScrollPosition * m_xScrollPixelsPerLine;
*yy = y - m_yScrollPosition * m_yScrollPixelsPerLine;
}
-void wxScrolledWindow::CalcUnscrolledPosition(const int x, const int y, float *xx, float *yy) const
+void wxScrolledWindow::CalcUnscrolledPosition(int x, int y, float *xx, float *yy) const
{
*xx = (float)(x + m_xScrollPosition * m_xScrollPixelsPerLine);
*yy = (float)(y + m_yScrollPosition * m_yScrollPixelsPerLine);
m_minimumPaneSize = 0;
}
-wxSplitterWindow::wxSplitterWindow(wxWindow *parent, const wxWindowID id, const wxPoint& pos,
- const wxSize& size, const long style, const wxString& name)
+wxSplitterWindow::wxSplitterWindow(wxWindow *parent, wxWindowID id, const wxPoint& pos,
+ const wxSize& size, long style, const wxString& name)
:wxWindow(parent, id, pos, size, style, name)
{
m_splitMode = wxSPLIT_VERTICAL;
SizeWindows();
}
-bool wxSplitterWindow::SashHitTest(const int x, const int y, const int tolerance)
+bool wxSplitterWindow::SashHitTest(int x, int y, int tolerance)
{
if ( m_windowTwo == NULL || m_sashPosition == 0)
return FALSE; // No sash
}
// Draw the sash tracker (for whilst moving the sash)
-void wxSplitterWindow::DrawSashTracker(const int x, const int y)
+void wxSplitterWindow::DrawSashTracker(int x, int y)
{
int w, h;
GetClientSize(&w, &h);
// Associates the given window with window 2, drawing the appropriate sash
// and changing the split mode.
// Does nothing and returns FALSE if the window is already split.
-bool wxSplitterWindow::SplitVertically(wxWindow *window1, wxWindow *window2, const int sashPosition)
+bool wxSplitterWindow::SplitVertically(wxWindow *window1, wxWindow *window2, int sashPosition)
{
if ( IsSplit() )
return FALSE;
return TRUE;
}
-bool wxSplitterWindow::SplitHorizontally(wxWindow *window1, wxWindow *window2, const int sashPosition)
+bool wxSplitterWindow::SplitHorizontally(wxWindow *window1, wxWindow *window2, int sashPosition)
{
if ( IsSplit() )
return FALSE;
return TRUE;
}
-void wxSplitterWindow::SetSashPosition(const int position, const bool redraw)
+void wxSplitterWindow::SetSashPosition(int position, bool redraw)
{
m_sashPosition = position;
delete[] m_statusStrings;
}
-bool wxStatusBar::Create(wxWindow *parent, const wxWindowID id,
+bool wxStatusBar::Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos,
const wxSize& size,
- const long style,
+ long style,
const wxString& name)
{
m_statusWidths = NULL;
return success;
}
-void wxStatusBar::SetFieldsCount(const int number, const int *widths)
+void wxStatusBar::SetFieldsCount(int number, int *widths)
{
m_nFields = number;
SetStatusWidths(number, widths);
}
-void wxStatusBar::SetStatusText(const wxString& text, const int number)
+void wxStatusBar::SetStatusText(const wxString& text, int number)
{
if ((number < 0) || (number >= m_nFields))
return;
#endif
}
-wxString wxStatusBar::GetStatusText(const int n) const
+wxString wxStatusBar::GetStatusText(int n) const
{
if ((n < 0) || (n >= m_nFields))
return wxString("");
return m_statusStrings[n];
}
-void wxStatusBar::SetStatusWidths(const int n, const int *widths_field)
+void wxStatusBar::SetStatusWidths(int n, int *widths_field)
{
// only set status widths, when n == number of statuswindows
if (n == m_nFields)
DrawField(dc, i);
}
-void wxStatusBar::DrawFieldText(wxDC& dc, const int i)
+void wxStatusBar::DrawFieldText(wxDC& dc, int i)
{
int leftMargin = 2;
dc.DestroyClippingRegion();
}
-void wxStatusBar::DrawField(wxDC& dc, const int i)
+void wxStatusBar::DrawField(wxDC& dc, int i)
{
wxRectangle rect;
GetFieldRect(i, rect);
}
// Get the position and size of the field's internal bounding rectangle
-bool wxStatusBar::GetFieldRect(const int n, wxRectangle& rect) const
+bool wxStatusBar::GetFieldRect(int n, wxRectangle& rect) const
{
if ((n < 0) || (n >= m_nFields))
return FALSE;
EVT_PAINT(wxTabbedDialog::OnPaint)
END_EVENT_TABLE()
-wxTabbedDialog::wxTabbedDialog(wxWindow *parent, const wxWindowID id,
+wxTabbedDialog::wxTabbedDialog(wxWindow *parent, wxWindowID id,
const wxString& title,
const wxPoint& pos, const wxSize& size,
- const long windowStyle, const wxString& name):
+ long windowStyle, const wxString& name):
wxDialog(parent, id, title, pos, size, windowStyle, name)
{
m_tabView = NULL;
EVT_PAINT(wxTabbedPanel::OnPaint)
END_EVENT_TABLE()
-wxTabbedPanel::wxTabbedPanel(wxWindow *parent, const wxWindowID id, const wxPoint& pos,
- const wxSize& size, const long windowStyle, const wxString& name):
+wxTabbedPanel::wxTabbedPanel(wxWindow *parent, wxWindowID id, const wxPoint& pos,
+ const wxSize& size, long windowStyle, const wxString& name):
wxPanel(parent, id, pos, size, windowStyle, name)
{
m_tabView = NULL;
m_hilightBrush = new wxBrush( wxSystemSettings::GetSystemColour(wxSYS_COLOUR_HIGHLIGHT), wxSOLID );
};
-wxTreeCtrl::wxTreeCtrl(wxWindow *parent, const wxWindowID id,
+wxTreeCtrl::wxTreeCtrl(wxWindow *parent, wxWindowID id,
const wxPoint& pos,
const wxSize& size,
long style, const wxString& name )
if (m_dc) delete m_dc;
};
-bool wxTreeCtrl::Create(wxWindow *parent, const wxWindowID id,
+bool wxTreeCtrl::Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos,
const wxSize& size,
long style
{
};
-wxMask::wxMask( const wxBitmap& WXUNUSED(bitmap), const int WXUNUSED(paletteIndex) )
+wxMask::wxMask( const wxBitmap& WXUNUSED(bitmap), int WXUNUSED(paletteIndex) )
{
};
if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
};
-wxBitmap::wxBitmap( const int width, const int height, const int depth )
+wxBitmap::wxBitmap( int width, int height, int depth )
{
m_refData = new wxBitmapRefData();
M_BMPDATA->m_mask = NULL;
if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
};
-wxBitmap::wxBitmap( const wxString &filename, const int type )
+wxBitmap::wxBitmap( const wxString &filename, int type )
{
LoadFile( filename, type );
};
// CMB 15/5/98: add constructor for xbm bitmaps
-wxBitmap::wxBitmap( const char bits[], const int width, const int height, const int WXUNUSED(depth))
+wxBitmap::wxBitmap( const char bits[], int width, int height, int WXUNUSED(depth))
{
m_refData = new wxBitmapRefData();
return M_BMPDATA->m_bpp;
};
-void wxBitmap::SetHeight( const int height )
+void wxBitmap::SetHeight( int height )
{
if (!Ok()) return;
M_BMPDATA->m_height = height;
};
-void wxBitmap::SetWidth( const int width )
+void wxBitmap::SetWidth( int width )
{
if (!Ok()) return;
M_BMPDATA->m_width = width;
};
-void wxBitmap::SetDepth( const int depth )
+void wxBitmap::SetDepth( int depth )
{
if (!Ok()) return;
M_BMPDATA->m_bpp = depth;
M_BMPDATA->m_mask = mask;
};
-bool wxBitmap::SaveFile( const wxString &WXUNUSED(name), const int WXUNUSED(type),
+bool wxBitmap::SaveFile( const wxString &WXUNUSED(name), int WXUNUSED(type),
wxPalette *WXUNUSED(palette) )
{
return FALSE;
};
-bool wxBitmap::LoadFile( const wxString &name, const int WXUNUSED(type) )
+bool wxBitmap::LoadFile( const wxString &name, int WXUNUSED(type) )
{
#ifdef USE_GDK_IMLIB
wxBitmapButton::wxBitmapButton( wxWindow *parent, wxWindowID id, const wxBitmap &bitmap,
const wxPoint &pos, const wxSize &size,
- const long style, const wxString &name )
+ long style, const wxString &name )
{
Create( parent, id, bitmap, pos, size, style, name );
};
bool wxBitmapButton::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bitmap,
const wxPoint &pos, const wxSize &size,
- const long style, const wxString &name )
+ long style, const wxString &name )
{
m_needParent = TRUE;
if (wxTheBrushList) wxTheBrushList->AddBrush( this );
};
-wxBrush::wxBrush( const wxColour &colour, const int style )
+wxBrush::wxBrush( const wxColour &colour, int style )
{
m_refData = new wxBrushRefData();
M_BRUSHDATA->m_style = style;
if (wxTheBrushList) wxTheBrushList->AddBrush( this );
};
-wxBrush::wxBrush( const wxString &colourName, const int style )
+wxBrush::wxBrush( const wxString &colourName, int style )
{
m_refData = new wxBrushRefData();
M_BRUSHDATA->m_style = style;
wxButton::wxButton( wxWindow *parent, wxWindowID id, const wxString &label,
const wxPoint &pos, const wxSize &size,
- const long style, const wxString &name )
+ long style, const wxString &name )
{
Create( parent, id, label, pos, size, style, name );
};
bool wxButton::Create( wxWindow *parent, wxWindowID id, const wxString &label,
const wxPoint &pos, const wxSize &size,
- const long style, const wxString &name )
+ long style, const wxString &name )
{
m_needParent = TRUE;
wxCheckBox::wxCheckBox( wxWindow *parent, wxWindowID id, const wxString &label,
const wxPoint &pos, const wxSize &size,
- const long style, const wxString &name )
+ long style, const wxString &name )
{
Create( parent, id, label, pos, size, style, name );
};
bool wxCheckBox::Create( wxWindow *parent, wxWindowID id, const wxString &label,
const wxPoint &pos, const wxSize &size,
- const long style, const wxString &name )
+ long style, const wxString &name )
{
m_needParent = TRUE;
return TRUE;
};
-void wxCheckBox::SetValue( const bool state )
+void wxCheckBox::SetValue( bool state )
{
if (state)
gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(m_widget), GTK_STATE_ACTIVE );
{
};
-wxChoice::wxChoice( wxWindow *parent, const wxWindowID id,
- const wxPoint &pos, const wxSize &size,
- const int n, const wxString choices[],
- const long style, const wxString &name )
+wxChoice::wxChoice( wxWindow *parent, wxWindowID id,
+ const wxPoint &pos, const wxSize &size,
+ int n, const wxString choices[],
+ long style, const wxString &name )
{
Create( parent, id, pos, size, n, choices, style, name );
};
-bool wxChoice::Create( wxWindow *parent, const wxWindowID id,
- const wxPoint &pos, const wxSize &size,
- const int n, const wxString choices[],
- const long style, const wxString &name )
+bool wxChoice::Create( wxWindow *parent, wxWindowID id,
+ const wxPoint &pos, const wxSize &size,
+ int n, const wxString choices[],
+ long style, const wxString &name )
{
m_needParent = TRUE;
return -1;
};
-wxString wxChoice::GetString( const int n ) const
+wxString wxChoice::GetString( int n ) const
{
GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) );
int count = 0;
return count;
};
-void wxChoice::SetColumns( const int WXUNUSED(n) )
+void wxChoice::SetColumns( int WXUNUSED(n) )
{
};
-void wxChoice::SetSelection( const int n )
+void wxChoice::SetSelection( int n )
{
int tmp = n;
gtk_option_menu_set_history( GTK_OPTION_MENU(m_widget), (gint)tmp );
IMPLEMENT_DYNAMIC_CLASS(wxComboBox,wxControl)
-bool wxComboBox::Create(wxWindow *parent, const wxWindowID id, const wxString& value,
+bool wxComboBox::Create(wxWindow *parent, wxWindowID id, const wxString& value,
const wxPoint& pos, const wxSize& size,
- const int n, const wxString choices[],
- const long style, const wxString& name )
+ int n, const wxString choices[],
+ long style, const wxString& name )
{
m_needParent = TRUE;
{
};
-void wxComboBox::Delete( const int n )
+void wxComboBox::Delete( int n )
{
GtkWidget *list = GTK_COMBO(m_widget)->list;
gtk_list_clear_items( GTK_LIST(list), n, n );
return -1;
};
-char* wxComboBox::GetClientData( const int n )
+char* wxComboBox::GetClientData( int n )
{
wxNode *node = m_clientData.Nth( n );
if (node) return (char*)node->Data();
return NULL;
};
-void wxComboBox::SetClientData( const int n, char * clientData )
+void wxComboBox::SetClientData( int n, char * clientData )
{
wxNode *node = m_clientData.Nth( n );
if (node) node->SetData( (wxObject*) clientData );
return -1;
};
-wxString wxComboBox::GetString( const int n ) const
+wxString wxComboBox::GetString( int n ) const
{
GtkWidget *list = GTK_COMBO(m_widget)->list;
return count;
};
-void wxComboBox::SetSelection( const int n )
+void wxComboBox::SetSelection( int n )
{
GtkWidget *list = GTK_COMBO(m_widget)->list;
gtk_list_select_item( GTK_LIST(list), n );
gtk_editable_paste_clipboard( GTK_EDITABLE(entry), 0 );
};
-void wxComboBox::SetInsertionPoint( const long pos )
+void wxComboBox::SetInsertionPoint( long pos )
{
GtkWidget *entry = GTK_COMBO(m_widget)->entry;
int tmp = (int) pos;
return (long) pos-1;
};
-void wxComboBox::Replace( const long from, const long to, const wxString& value )
+void wxComboBox::Replace( long from, long to, const wxString& value )
{
GtkWidget *entry = GTK_COMBO(m_widget)->entry;
gtk_editable_delete_text( GTK_EDITABLE(entry), (gint)from, (gint)to );
gtk_editable_insert_text( GTK_EDITABLE(entry), value, value.Length(), &pos );
};
-void wxComboBox::Remove(const long from, const long to)
+void wxComboBox::Remove(long from, long to)
{
GtkWidget *entry = GTK_COMBO(m_widget)->entry;
gtk_editable_delete_text( GTK_EDITABLE(entry), (gint)from, (gint)to );
};
-void wxComboBox::SetSelection( const long WXUNUSED(from), const long WXUNUSED(to) )
+void wxComboBox::SetSelection( long WXUNUSED(from), long WXUNUSED(to) )
{
};
-void wxComboBox::SetEditable( const bool WXUNUSED(editable) )
+void wxComboBox::SetEditable( bool WXUNUSED(editable) )
{
};
wxControl::wxControl( wxWindow *parent, wxWindowID id,
const wxPoint &pos, const wxSize &size,
- const long style, const wxString &name ) :
+ long style, const wxString &name ) :
wxWindow( parent, id, pos, size, style, name )
{
};
{
};
-wxCursor::wxCursor( const int cursorId )
+wxCursor::wxCursor( int cursorId )
{
m_refData = new wxCursorRefData();
wxDialog::wxDialog( wxWindow *parent,
wxWindowID id, const wxString &title,
const wxPoint &pos, const wxSize &size,
- const long style, const wxString &name )
+ long style, const wxString &name )
{
wxTopLevelWindows.Insert( this );
Create( parent, id, title, pos, size, style, name );
bool wxDialog::Create( wxWindow *parent,
wxWindowID id, const wxString &title,
const wxPoint &pos, const wxSize &size,
- const long style, const wxString &name )
+ long style, const wxString &name )
{
m_needParent = FALSE;
};
};
-bool wxDialog::Show( const bool show )
+bool wxDialog::Show( bool show )
{
if (!show && m_modalShowing)
{
g_blockEventsOnDrag = FALSE;
};
-void wxDragSource::SetData( char *data, const long size )
+void wxDragSource::SetData( char *data, long size )
{
m_size = size;
m_data = data;
wxTopLevelWindows.Insert( this );
};
-wxFrame::wxFrame( wxWindow *parent, const wxWindowID id, const wxString &title,
- const wxPoint &pos, const wxSize &size,
- const long style, const wxString &name )
+wxFrame::wxFrame( wxWindow *parent, wxWindowID id, const wxString &title,
+ const wxPoint &pos, const wxSize &size,
+ long style, const wxString &name )
{
m_sizeSet = FALSE;
Create( parent, id, title, pos, size, style, name );
wxTopLevelWindows.Insert( this );
};
-bool wxFrame::Create( wxWindow *parent, const wxWindowID id, const wxString &title,
+bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title,
const wxPoint &pos, const wxSize &size,
- const long style, const wxString &name )
+ long style, const wxString &name )
{
m_needParent = FALSE;
m_mainWindow = NULL;
if (wxTopLevelWindows.Number() == 0) wxTheApp->ExitMainLoop();
};
-bool wxFrame::Show( const bool show )
+bool wxFrame::Show( bool show )
{
if (show)
{
return wxWindow::Show( show );
};
-void wxFrame::Enable( const bool enable )
+void wxFrame::Enable( bool enable )
{
wxWindow::Enable( enable );
gtk_widget_set_sensitive( m_mainWindow, enable );
m_frameMenuBar->m_widget, m_frameMenuBar->m_x, m_frameMenuBar->m_y );
};
-bool wxFrame::CreateStatusBar( const int number )
+bool wxFrame::CreateStatusBar( int number )
{
if (m_frameStatusBar)
delete m_frameStatusBar;
return TRUE;
};
-void wxFrame::SetStatusText( const wxString &text, const int number )
+void wxFrame::SetStatusText( const wxString &text, int number )
{
if (m_frameStatusBar) m_frameStatusBar->SetStatusText( text, number );
};
-void wxFrame::SetStatusWidths( const int n, const int *width )
+void wxFrame::SetStatusWidths( int n, int *width )
{
if (m_frameStatusBar) m_frameStatusBar->SetStatusWidths( n, width );
};
IMPLEMENT_DYNAMIC_CLASS(wxGauge,wxControl)
-bool wxGauge::Create( wxWindow *parent, const wxWindowID id, const int range,
+bool wxGauge::Create( wxWindow *parent, wxWindowID id, int range,
const wxPoint& pos, const wxSize& size,
- const long style, const wxString& name )
+ long style, const wxString& name )
{
m_needParent = TRUE;
return TRUE;
};
-void wxGauge::SetRange( const int r )
+void wxGauge::SetRange( int r )
{
m_rangeMax = r;
if (m_gaugePos > m_rangeMax) m_gaugePos = m_rangeMax;
gtk_progress_bar_update( GTK_PROGRESS_BAR(m_widget), (float)(m_rangeMax/m_gaugePos) );
};
-void wxGauge::SetValue( const int pos )
+void wxGauge::SetValue( int pos )
{
m_gaugePos = pos;
if (m_gaugePos > m_rangeMax) m_gaugePos = m_rangeMax;
wxListBox::wxListBox( wxWindow *parent, wxWindowID id,
const wxPoint &pos, const wxSize &size,
- const int n, const wxString choices[],
- const long style, const wxString &name )
+ int n, const wxString choices[],
+ long style, const wxString &name )
{
Create( parent, id, pos, size, n, choices, style, name );
};
bool wxListBox::Create( wxWindow *parent, wxWindowID id,
const wxPoint &pos, const wxSize &size,
- const int n, const wxString choices[],
- const long style, const wxString &name )
+ int n, const wxString choices[],
+ long style, const wxString &name )
{
m_needParent = TRUE;
return -1;
};
-char *wxListBox::GetClientData( const int WXUNUSED(n) ) const
+char *wxListBox::GetClientData( int WXUNUSED(n) ) const
{
wxFAIL_MSG("wxListBox::GetClientData not implemented");
return count;
};
-bool wxListBox::Selected( const int n )
+bool wxListBox::Selected( int n )
{
GList *target = g_list_nth( m_list->children, n );
if (target)
return FALSE;
};
-void wxListBox::Set( const int WXUNUSED(n), const wxString *WXUNUSED(choices) )
+void wxListBox::Set( int WXUNUSED(n), const wxString *WXUNUSED(choices) )
{
};
-void wxListBox::SetClientData( const int WXUNUSED(n), char *WXUNUSED(clientData) )
+void wxListBox::SetClientData( int WXUNUSED(n), char *WXUNUSED(clientData) )
{
};
{
};
-void wxListBox::SetSelection( const int n, const bool select )
+void wxListBox::SetSelection( int n, bool select )
{
if (select)
gtk_list_select_item( m_list, n );
gtk_list_unselect_item( m_list, n );
};
-void wxListBox::SetString( const int WXUNUSED(n), const wxString &WXUNUSED(string) )
+void wxListBox::SetString( int WXUNUSED(n), const wxString &WXUNUSED(string) )
{
};
-void wxListBox::SetStringSelection( const wxString &string, const bool select )
+void wxListBox::SetStringSelection( const wxString &string, bool select )
{
SetSelection( FindString(string), select );
};
};
wxMDIParentFrame::wxMDIParentFrame( wxWindow *parent,
- const wxWindowID id, const wxString& title,
+ wxWindowID id, const wxString& title,
const wxPoint& pos, const wxSize& size,
- const long style, const wxString& name )
+ long style, const wxString& name )
{
m_clientWindow = NULL;
m_currentChild = NULL;
};
bool wxMDIParentFrame::Create( wxWindow *parent,
- const wxWindowID id, const wxString& title,
+ wxWindowID id, const wxString& title,
const wxPoint& pos, const wxSize& size,
- const long style, const wxString& name )
+ long style, const wxString& name )
{
wxFrame::Create( parent, id, title, pos, size, style, name );
};
wxMDIChildFrame::wxMDIChildFrame( wxMDIParentFrame *parent,
- const wxWindowID id, const wxString& title,
+ wxWindowID id, const wxString& title,
const wxPoint& pos, const wxSize& size,
- const long style, const wxString& name )
+ long style, const wxString& name )
{
Create( parent, id, title, pos, size, style, name );
};
};
bool wxMDIChildFrame::Create( wxMDIParentFrame *parent,
- const wxWindowID id, const wxString& title,
+ wxWindowID id, const wxString& title,
const wxPoint& pos, const wxSize& size,
- const long style, const wxString& name )
+ long style, const wxString& name )
{
m_title = title;
return wxPanel::Create( parent->GetClientWindow(), id, pos, size, style, name );
{
};
-wxMDIClientWindow::wxMDIClientWindow( wxMDIParentFrame *parent, const long style )
+wxMDIClientWindow::wxMDIClientWindow( wxMDIParentFrame *parent, long style )
{
CreateClient( parent, style );
};
{
};
-bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, const long style )
+bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style )
{
m_needParent = TRUE;
m_items.Append( mitem );
};
-void wxMenu::Append( const int id, const wxString &item, const wxString &helpStr, const bool checkable )
+void wxMenu::Append( int id, const wxString &item, const wxString &helpStr, bool checkable )
{
wxMenuItem *mitem = new wxMenuItem();
mitem->m_id = id;
m_items.Append( mitem );
};
-void wxMenu::Append( const int id, const wxString &item, wxMenu *subMenu, const wxString &helpStr )
+void wxMenu::Append( int id, const wxString &item, wxMenu *subMenu, const wxString &helpStr )
{
wxMenuItem *mitem = new wxMenuItem();
mitem->m_id = id;
return -1;
};
-void wxMenu::Enable( const int id, const bool enable )
+void wxMenu::Enable( int id, bool enable )
{
wxNode *node = m_items.First();
while (node)
};
};
-bool wxMenu::Enabled( const int id ) const
+bool wxMenu::Enabled( int id ) const
{
wxNode *node = m_items.First();
while (node)
return FALSE;
};
-void wxMenu::SetLabel( const int id, const wxString &label )
+void wxMenu::SetLabel( int id, const wxString &label )
{
wxString s( label );
size_t pos;
Init();
};
-wxNotebook::wxNotebook( wxWindow *parent, const wxWindowID id,
+wxNotebook::wxNotebook( wxWindow *parent, wxWindowID id,
const wxPoint& pos, const wxSize& size,
- const long style, const wxString& name )
+ long style, const wxString& name )
{
Init();
Create( parent, id, pos, size, style, name );
DeleteAllPages();
};
-bool wxNotebook::Create(wxWindow *parent, const wxWindowID id,
+bool wxNotebook::Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos, const wxSize& size,
- const long style, const wxString& name )
+ long style, const wxString& name )
{
m_needParent = TRUE;
return TRUE;
};
-bool wxNotebook::SetPageImage( int page, const int image )
+bool wxNotebook::SetPageImage( int page, int image )
{
wxNotebookPage* nb_page = GetNotebookPage(page);
if (!nb_page)
{
};
-wxPalette::wxPalette( const int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue )
+wxPalette::wxPalette( int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue )
{
m_refData = new wxPaletteRefData();
Create( n, red, green, blue );
return (m_refData);
};
-bool wxPalette::Create( const int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue)
+bool wxPalette::Create( int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue)
{
};
{
};
-bool wxPalette::GetRGB( const int pixel, unsigned char *red, unsigned char *green, unsigned char *blue ) const
+bool wxPalette::GetRGB( int pixel, unsigned char *red, unsigned char *green, unsigned char *blue ) const
{
};
M_PENDATA->m_colour = colourName;
};
-void wxPen::SetColour( const int red, const int green, const int blue )
+void wxPen::SetColour( int red, int green, int blue )
{
if (!m_refData)
m_refData = new wxPenRefData();
{
};
-wxRadioBox::wxRadioBox( wxWindow *parent, const wxWindowID id, const wxString& title,
- const wxPoint &pos, const wxSize &size,
- const int n, const wxString choices[],
- const int majorDim, const long style,
+wxRadioBox::wxRadioBox( wxWindow *parent, wxWindowID id, const wxString& title,
+ const wxPoint &pos, const wxSize &size,
+ int n, const wxString choices[],
+ int majorDim, long style,
const wxString &name )
{
Create( parent, id, title, pos, size, n, choices, majorDim, style, name );
};
-bool wxRadioBox::Create( wxWindow *parent, const wxWindowID id, const wxString& title,
- const wxPoint &pos, const wxSize &size,
- const int n, const wxString choices[],
- const int WXUNUSED(majorDim), const long style,
+bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
+ const wxPoint &pos, const wxSize &size,
+ int n, const wxString choices[],
+ int WXUNUSED(majorDim), long style,
const wxString &name )
{
m_needParent = TRUE;
return TRUE;
};
-bool wxRadioBox::Show( const bool show )
+bool wxRadioBox::Show( bool show )
{
wxWindow::Show( show );
return 0;
};
-void wxRadioBox::SetSelection( const int WXUNUSED(n) )
+void wxRadioBox::SetSelection( int WXUNUSED(n) )
{
};
return -1;
};
-wxString wxRadioBox::GetString( const int WXUNUSED(n) ) const
+wxString wxRadioBox::GetString( int WXUNUSED(n) ) const
{
return "";
};
{
};
-void wxRadioBox::SetLabel( const int WXUNUSED(item), const wxString& WXUNUSED(label) )
+void wxRadioBox::SetLabel( int WXUNUSED(item), const wxString& WXUNUSED(label) )
{
};
-void wxRadioBox::SetLabel( const int WXUNUSED(item), wxBitmap *WXUNUSED(bitmap) )
+void wxRadioBox::SetLabel( int WXUNUSED(item), wxBitmap *WXUNUSED(bitmap) )
{
};
-wxString wxRadioBox::GetLabel( const int WXUNUSED(item) ) const
+wxString wxRadioBox::GetLabel( int WXUNUSED(item) ) const
{
return "";
};
-void wxRadioBox::Enable( const bool WXUNUSED(enable) )
+void wxRadioBox::Enable( bool WXUNUSED(enable) )
{
};
-void wxRadioBox::Enable( const int WXUNUSED(item), const bool WXUNUSED(enable) )
+void wxRadioBox::Enable( int WXUNUSED(item), bool WXUNUSED(enable) )
{
};
-void wxRadioBox::Show( const int WXUNUSED(item), const bool WXUNUSED(show) )
+void wxRadioBox::Show( int WXUNUSED(item), bool WXUNUSED(show) )
{
};
return 1;
};
-void wxRadioBox::SetNumberOfRowsOrCols( const int WXUNUSED(n) )
+void wxRadioBox::SetNumberOfRowsOrCols( int WXUNUSED(n) )
{
};
IMPLEMENT_DYNAMIC_CLASS(wxScrollBar,wxControl)
-wxScrollBar::wxScrollBar(wxWindow *parent, const wxWindowID id,
+wxScrollBar::wxScrollBar(wxWindow *parent, wxWindowID id,
const wxPoint& pos, const wxSize& size,
- const long style, const wxString& name )
+ long style, const wxString& name )
{
Create( parent, id, pos, size, style, name );
};
{
};
-bool wxScrollBar::Create(wxWindow *parent, const wxWindowID id,
+bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos, const wxSize& size,
- const long style, const wxString& name )
+ long style, const wxString& name )
{
m_needParent = TRUE;
return (int)(m_adjust->upper+0.5);
};
-void wxScrollBar::SetPosition( const int viewStart )
+void wxScrollBar::SetPosition( int viewStart )
{
float fpos = (float)viewStart;
m_oldPos = fpos;
gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" );
};
-void wxScrollBar::SetScrollbar( const int position, const int thumbSize, const int range, const int pageSize,
- const bool WXUNUSED(refresh) )
+void wxScrollBar::SetScrollbar( int position, int thumbSize, int range, int pageSize,
+ bool WXUNUSED(refresh) )
{
float fpos = (float)position;
m_oldPos = fpos;
return GetPosition();
};
-void wxScrollBar::SetValue( const int viewStart )
+void wxScrollBar::SetValue( int viewStart )
{
SetPosition( viewStart );
};
return (int)(m_adjust->page_size+0.5);
};
-void wxScrollBar::SetPageSize( const int pageLength )
+void wxScrollBar::SetPageSize( int pageLength )
{
int pos = (int)(m_adjust->value+0.5);
int thumb = (int)(m_adjust->page_size+0.5);
SetScrollbar( pos, thumb, range, pageLength );
};
-void wxScrollBar::SetObjectLength( const int objectLength )
+void wxScrollBar::SetObjectLength( int objectLength )
{
int pos = (int)(m_adjust->value+0.5);
int page = (int)(m_adjust->page_increment+0.5);
SetScrollbar( pos, objectLength, range, page );
};
-void wxScrollBar::SetViewLength( const int viewLength )
+void wxScrollBar::SetViewLength( int viewLength )
{
int pos = (int)(m_adjust->value+0.5);
int thumb = (int)(m_adjust->page_size+0.5);
{
};
-wxSlider::wxSlider( wxWindow *parent, const wxWindowID id,
- const int value, const int minValue, const int maxValue,
+wxSlider::wxSlider( wxWindow *parent, wxWindowID id,
+ int value, int minValue, int maxValue,
const wxPoint& pos, const wxSize& size,
- const long style,
+ long style,
/* const wxValidator& validator = wxDefaultValidator, */
const wxString& name )
{
{
};
-bool wxSlider::Create(wxWindow *parent, const wxWindowID id,
- const int value, const int minValue, const int maxValue,
+bool wxSlider::Create(wxWindow *parent, wxWindowID id,
+ int value, int minValue, int maxValue,
const wxPoint& pos, const wxSize& size,
- const long style,
+ long style,
/* const wxValidator& validator = wxDefaultValidator, */
const wxString& name )
{
return (int)(m_adjust->value+0.5);
};
-void wxSlider::SetValue( const int value )
+void wxSlider::SetValue( int value )
{
float fpos = (float)value;
m_oldPos = fpos;
gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" );
};
-void wxSlider::SetRange( const int minValue, const int maxValue )
+void wxSlider::SetRange( int minValue, int maxValue )
{
float fmin = (float)minValue;
float fmax = (float)maxValue;
return (int)(m_adjust->upper+0.5);
};
-void wxSlider::SetPageSize( const int pageSize )
+void wxSlider::SetPageSize( int pageSize )
{
float fpage = (float)pageSize;
return (int)(m_adjust->page_increment+0.5);
};
-void wxSlider::SetThumbLength( const int len )
+void wxSlider::SetThumbLength( int len )
{
float flen = (float)len;
return (int)(m_adjust->page_size+0.5);
};
-void wxSlider::SetLineSize( const int WXUNUSED(lineSize) )
+void wxSlider::SetLineSize( int WXUNUSED(lineSize) )
{
};
wxWindow::GetSize( x, y );
};
-void wxSlider::SetSize( const int x, const int y, const int width, const int height, const int sizeFlags )
+void wxSlider::SetSize( int x, int y, int width, int height, int sizeFlags )
{
wxWindow::SetSize( x, y, width, height, sizeFlags );
};
wxWindow::GetPosition( x, y );
};
-void wxSlider::SetTick( const int WXUNUSED(tickPos) )
+void wxSlider::SetTick( int WXUNUSED(tickPos) )
{
};
-void wxSlider::SetTickFreq( const int WXUNUSED(n), const int WXUNUSED(pos) )
+void wxSlider::SetTickFreq( int WXUNUSED(n), int WXUNUSED(pos) )
{
};
{
};
-void wxSlider::SetSelection( const int WXUNUSED(minPos), const int WXUNUSED(maxPos) )
+void wxSlider::SetSelection( int WXUNUSED(minPos), int WXUNUSED(maxPos) )
{
};
wxStaticBitmap::wxStaticBitmap( wxWindow *parent, wxWindowID id, const wxBitmap &bitmap,
const wxPoint &pos, const wxSize &size,
- const long style, const wxString &name )
+ long style, const wxString &name )
{
Create( parent, id, bitmap, pos, size, style, name );
};
bool wxStaticBitmap::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bitmap,
const wxPoint &pos, const wxSize &size,
- const long style, const wxString &name )
+ long style, const wxString &name )
{
m_needParent = TRUE;
wxStaticBox::wxStaticBox( wxWindow *parent, wxWindowID id, const wxString &label,
const wxPoint &pos, const wxSize &size,
- const long style, const wxString &name )
+ long style, const wxString &name )
{
Create( parent, id, label, pos, size, style, name );
};
bool wxStaticBox::Create( wxWindow *parent, wxWindowID id, const wxString &label,
const wxPoint &pos, const wxSize &size,
- const long style, const wxString &name )
+ long style, const wxString &name )
{
m_needParent = TRUE;
wxStaticText::wxStaticText( wxWindow *parent, wxWindowID id, const wxString &label,
const wxPoint &pos, const wxSize &size,
- const long style, const wxString &name )
+ long style, const wxString &name )
{
Create( parent, id, label, pos, size, style, name );
};
bool wxStaticText::Create( wxWindow *parent, wxWindowID id, const wxString &label,
const wxPoint &pos, const wxSize &size,
- const long style, const wxString &name )
+ long style, const wxString &name )
{
m_needParent = TRUE;
IMPLEMENT_DYNAMIC_CLASS(wxToolBarTool,wxObject)
-wxToolBarTool::wxToolBarTool( wxToolBarGTK *owner, const int theIndex,
- const wxBitmap& bitmap1, const wxBitmap& bitmap2,
- const bool toggle, wxObject *clientData,
+wxToolBarTool::wxToolBarTool( wxToolBarGTK *owner, int theIndex,
+ const wxBitmap& bitmap1, const wxBitmap& bitmap2,
+ bool toggle, wxObject *clientData,
const wxString& shortHelpString, const wxString& longHelpString )
{
m_owner = owner;
{
};
-wxToolBarGTK::wxToolBarGTK( wxWindow *parent, const wxWindowID id,
+wxToolBarGTK::wxToolBarGTK( wxWindow *parent, wxWindowID id,
const wxPoint& pos, const wxSize& size,
- const long style, const wxString& name )
+ long style, const wxString& name )
{
Create( parent, id, pos, size, style, name );
};
{
};
-bool wxToolBarGTK::Create( wxWindow *parent, const wxWindowID id,
+bool wxToolBarGTK::Create( wxWindow *parent, wxWindowID id,
const wxPoint& pos, const wxSize& size,
- const long style, const wxString& name )
+ long style, const wxString& name )
{
m_needParent = TRUE;
GetEventHandler()->ProcessEvent(event);
};
-wxToolBarTool *wxToolBarGTK::AddTool( const int toolIndex, const wxBitmap& bitmap,
- const wxBitmap& pushedBitmap, const bool toggle,
- const float WXUNUSED(xPos), const float WXUNUSED(yPos), wxObject *clientData,
+wxToolBarTool *wxToolBarGTK::AddTool( int toolIndex, const wxBitmap& bitmap,
+ const wxBitmap& pushedBitmap, bool toggle,
+ float WXUNUSED(xPos), float WXUNUSED(yPos), wxObject *clientData,
const wxString& helpString1, const wxString& helpString2 )
{
if (!bitmap.Ok()) return NULL;
{
};
-void wxToolBarGTK::EnableTool(const int toolIndex, const bool enable)
+void wxToolBarGTK::EnableTool(int toolIndex, bool enable)
{
};
-void wxToolBarGTK::ToggleTool(const int toolIndex, const bool toggle)
+void wxToolBarGTK::ToggleTool(int toolIndex, bool toggle)
{
};
-void wxToolBarGTK::SetToggle(const int toolIndex, const bool toggle)
+void wxToolBarGTK::SetToggle(int toolIndex, bool toggle)
{
};
-wxObject *wxToolBarGTK::GetToolClientData(const int index) const
+wxObject *wxToolBarGTK::GetToolClientData(int index) const
{
};
-bool wxToolBarGTK::GetToolState(const int toolIndex) const
+bool wxToolBarGTK::GetToolState(int toolIndex) const
{
};
-bool wxToolBarGTK::GetToolEnabled(const int toolIndex) const
+bool wxToolBarGTK::GetToolEnabled(int toolIndex) const
{
};
-void wxToolBarGTK::SetMargins(const int x, const int y)
+void wxToolBarGTK::SetMargins(int x, int y)
{
};
-void wxToolBarGTK::SetToolPacking(const int packing)
+void wxToolBarGTK::SetToolPacking(int packing)
{
};
-void wxToolBarGTK::SetToolSeparation(const int separation)
+void wxToolBarGTK::SetToolSeparation(int separation)
{
};
m_modified = FALSE;
};
-wxTextCtrl::wxTextCtrl( wxWindow *parent, const wxWindowID id, const wxString &value,
+wxTextCtrl::wxTextCtrl( wxWindow *parent, wxWindowID id, const wxString &value,
const wxPoint &pos, const wxSize &size,
- const int style, const wxString &name ) : streambuf()
+ int style, const wxString &name ) : streambuf()
{
m_modified = FALSE;
Create( parent, id, value, pos, size, style, name );
};
-bool wxTextCtrl::Create( wxWindow *parent, const wxWindowID id, const wxString &value,
+bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
const wxPoint &pos, const wxSize &size,
- const int style, const wxString &name )
+ int style, const wxString &name )
{
m_needParent = TRUE;
};
/*
-wxString wxTextCtrl::GetLineText( const long lineNo ) const
+wxString wxTextCtrl::GetLineText( long lineNo ) const
{
};
{
};
-long wxTextCtrl::PositionToXY( const long pos, long *x, long *y ) const
+long wxTextCtrl::PositionToXY( long pos, long *x, long *y ) const
{
};
-long wxTextCtrl::XYToPosition( const long x, const long y )
+long wxTextCtrl::XYToPosition( long x, long y )
{
};
};
*/
-void wxTextCtrl::SetInsertionPoint( const long pos )
+void wxTextCtrl::SetInsertionPoint( long pos )
{
int tmp = (int) pos;
if (m_windowStyle & wxTE_MULTILINE)
SetInsertionPoint( pos-1 );
};
-void wxTextCtrl::SetEditable( const bool editable )
+void wxTextCtrl::SetEditable( bool editable )
{
if (m_windowStyle & wxTE_MULTILINE)
gtk_text_set_editable( GTK_TEXT(m_widget), editable );
gtk_entry_set_editable( GTK_ENTRY(m_widget), editable );
};
-void wxTextCtrl::SetSelection( const long from, const long to )
+void wxTextCtrl::SetSelection( long from, long to )
{
gtk_editable_select_region( GTK_EDITABLE(m_widget), (gint)from, (gint)to );
};
-void wxTextCtrl::ShowPosition( const long WXUNUSED(pos) )
+void wxTextCtrl::ShowPosition( long WXUNUSED(pos) )
{
wxFAIL_MSG("wxTextCtrl::ShowPosition not implemented");
};
return (long)pos-1;
};
-void wxTextCtrl::Remove( const long from, const long to )
+void wxTextCtrl::Remove( long from, long to )
{
gtk_editable_delete_text( GTK_EDITABLE(m_widget), (gint)from, (gint)to );
};
-void wxTextCtrl::Replace( const long from, const long to, const wxString &value )
+void wxTextCtrl::Replace( long from, long to, const wxString &value )
{
gtk_editable_delete_text( GTK_EDITABLE(m_widget), (gint)from, (gint)to );
if (value.IsNull()) return;
return *this;
}
-wxTextCtrl& wxTextCtrl::operator<<(const float f)
+wxTextCtrl& wxTextCtrl::operator<<(float f)
{
static char buf[100];
sprintf(buf, "%.2f", f);
return *this;
}
-wxTextCtrl& wxTextCtrl::operator<<(const double d)
+wxTextCtrl& wxTextCtrl::operator<<(double d)
{
static char buf[100];
sprintf(buf, "%.2f", d);
return *this;
}
-wxTextCtrl& wxTextCtrl::operator<<(const int i)
+wxTextCtrl& wxTextCtrl::operator<<(int i)
{
static char buf[100];
sprintf(buf, "%i", i);
return *this;
}
-wxTextCtrl& wxTextCtrl::operator<<(const long i)
+wxTextCtrl& wxTextCtrl::operator<<(long i)
{
static char buf[100];
sprintf(buf, "%ld", i);
m_pDropTarget = NULL;
};
-wxWindow::wxWindow( wxWindow *parent, const wxWindowID id,
- const wxPoint &pos, const wxSize &size,
- const long style, const wxString &name )
+wxWindow::wxWindow( wxWindow *parent, wxWindowID id,
+ const wxPoint &pos, const wxSize &size,
+ long style, const wxString &name )
{
Create( parent, id, pos, size, style, name );
};
-bool wxWindow::Create( wxWindow *parent, const wxWindowID id,
- const wxPoint &pos, const wxSize &size,
- const long style, const wxString &name )
+bool wxWindow::Create( wxWindow *parent, wxWindowID id,
+ const wxPoint &pos, const wxSize &size,
+ long style, const wxString &name )
{
m_isShown = FALSE;
m_isEnabled = TRUE;
};
-void wxWindow::PreCreation( wxWindow *parent, const wxWindowID id,
- const wxPoint &pos, const wxSize &size,
- const long style, const wxString &name )
+void wxWindow::PreCreation( wxWindow *parent, wxWindowID id,
+ const wxPoint &pos, const wxSize &size,
+ long style, const wxString &name )
{
if (m_needParent && (parent == NULL))
wxFatalError( "Need complete parent.", name );
return m_hasVMT;
};
-bool wxWindow::Close( const bool force )
+bool wxWindow::Close( bool force )
{
wxCloseEvent event(wxEVT_CLOSE_WINDOW, m_windowId);
event.SetEventObject(this);
gtk_widget_set_uposition( m_widget, m_x, m_y );
};
-void wxWindow::SetSize( const int x, const int y, const int width, const int height, const int sizeFlags )
+void wxWindow::SetSize( int x, int y, int width, int height, int sizeFlags )
{
int newX = x;
int newY = y;
ProcessEvent( event );
};
-void wxWindow::SetSize( const int width, const int height )
+void wxWindow::SetSize( int width, int height )
{
SetSize( -1, -1, width, height, wxSIZE_USE_EXISTING );
};
-void wxWindow::Move( const int x, const int y )
+void wxWindow::Move( int x, int y )
{
SetSize( x, y, -1, -1, wxSIZE_USE_EXISTING );
};
(*height) = m_height;
};
-void wxWindow::SetClientSize( const int width, const int height )
+void wxWindow::SetClientSize( int width, int height )
{
if (!m_wxwindow)
{
if (y) *y -= org_y;
};
-void wxWindow::Centre( const int direction )
+void wxWindow::Centre( int direction )
{
int x = 0;
int y = 0;
if (GetAutoLayout()) Layout();
};
-bool wxWindow::Show( const bool show )
+bool wxWindow::Show( bool show )
{
if (show)
gtk_widget_show( m_widget );
return TRUE;
};
-void wxWindow::Enable( const bool enable )
+void wxWindow::Enable( bool enable )
{
m_isEnabled = enable;
gtk_widget_set_sensitive( m_widget, enable );
if (m_wxwindow) gtk_widget_set_sensitive( m_wxwindow, enable );
};
-void wxWindow::MakeModal( const bool modal )
+void wxWindow::MakeModal( bool modal )
{
return;
// Disable all other windows
gdk_window_set_cursor( m_wxwindow->window, m_cursor->GetCursor() );
};
-void wxWindow::Refresh( const bool eraseBackground, const wxRect *rect )
+void wxWindow::Refresh( bool eraseBackground, const wxRect *rect )
{
if (eraseBackground && m_wxwindow && m_wxwindow->window)
{
};
};
-bool wxWindow::IsExposed( const long x, const long y )
+bool wxWindow::IsExposed( long x, long y )
{
return (m_updateRegion.Contains( x, y ) != wxOutRegion );
};
-bool wxWindow::IsExposed( const long x, const long y, const long width, const long height )
+bool wxWindow::IsExposed( long x, long y, long width, long height )
{
return (m_updateRegion.Contains( x, y, width, height ) != wxOutRegion );
};
return FALSE;
};
-wxWindow *wxWindow::FindWindow( const long id )
+wxWindow *wxWindow::FindWindow( long id )
{
if (id == m_windowId) return this;
wxNode *node = m_children.First();
return NULL;
};
-void wxWindow::SetScrollbar( const int orient, const int pos, const int thumbVisible,
- const int range, const bool WXUNUSED(refresh) )
+void wxWindow::SetScrollbar( int orient, int pos, int thumbVisible,
+ int range, bool WXUNUSED(refresh) )
{
if (!m_wxwindow) return;
};
};
-void wxWindow::SetScrollPos( const int orient, const int pos, const bool WXUNUSED(refresh) )
+void wxWindow::SetScrollPos( int orient, int pos, bool WXUNUSED(refresh) )
{
if (!m_wxwindow) return;
};
};
-int wxWindow::GetScrollThumb( const int orient ) const
+int wxWindow::GetScrollThumb( int orient ) const
{
if (!m_wxwindow) return 0;
return (int)(m_vAdjust->page_size+0.5);
};
-int wxWindow::GetScrollPos( const int orient ) const
+int wxWindow::GetScrollPos( int orient ) const
{
if (!m_wxwindow) return 0;
return (int)(m_vAdjust->value+0.5);
};
-int wxWindow::GetScrollRange( const int orient ) const
+int wxWindow::GetScrollRange( int orient ) const
{
if (!m_wxwindow) return 0;
return (int)(m_vAdjust->upper+0.5);
};
-void wxWindow::ScrollWindow( const int dx, const int dy, const wxRect* WXUNUSED(rect) )
+void wxWindow::ScrollWindow( int dx, int dy, const wxRect* WXUNUSED(rect) )
{
if (!m_wxwindow) return;
}
;
-void wxWindow::SetAutoLayout( const bool autoLayout )
+void wxWindow::SetAutoLayout( bool autoLayout )
{
m_autoLayout = autoLayout;
};
}
// Do a phase of evaluating child constraints
-bool wxWindow::DoPhase(const int phase)
+bool wxWindow::DoPhase(int phase)
{
int noIterations = 0;
int maxIterations = 500;
// Need to distinguish between setting the 'fake' size for
// windows and sizers, and setting the real values.
-void wxWindow::SetConstraintSizes(const bool recurse)
+void wxWindow::SetConstraintSizes(bool recurse)
{
wxLayoutConstraints *constr = GetConstraints();
if (constr && constr->left.GetDone() && constr->right.GetDone() &&
*y += yp;
}
-void wxWindow::SizerSetSize(const int x, const int y, const int w, const int h)
+void wxWindow::SizerSetSize(int x, int y, int w, int h)
{
int xx = x;
int yy = y;
SetSize(xx, yy, w, h);
}
-void wxWindow::SizerMove(const int x, const int y)
+void wxWindow::SizerMove(int x, int y)
{
int xx = x;
int yy = y;
}
// Only set the size/position of the constraint (if any)
-void wxWindow::SetSizeConstraint(const int x, const int y, const int w, const int h)
+void wxWindow::SetSizeConstraint(int x, int y, int w, int h)
{
wxLayoutConstraints *constr = GetConstraints();
if (constr)
}
}
-void wxWindow::MoveConstraint(const int x, const int y)
+void wxWindow::MoveConstraint(int x, int y)
{
wxLayoutConstraints *constr = GetConstraints();
if (constr)
{
};
-wxMask::wxMask( const wxBitmap& WXUNUSED(bitmap), const int WXUNUSED(paletteIndex) )
+wxMask::wxMask( const wxBitmap& WXUNUSED(bitmap), int WXUNUSED(paletteIndex) )
{
};
if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
};
-wxBitmap::wxBitmap( const int width, const int height, const int depth )
+wxBitmap::wxBitmap( int width, int height, int depth )
{
m_refData = new wxBitmapRefData();
M_BMPDATA->m_mask = NULL;
if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
};
-wxBitmap::wxBitmap( const wxString &filename, const int type )
+wxBitmap::wxBitmap( const wxString &filename, int type )
{
LoadFile( filename, type );
};
// CMB 15/5/98: add constructor for xbm bitmaps
-wxBitmap::wxBitmap( const char bits[], const int width, const int height, const int WXUNUSED(depth))
+wxBitmap::wxBitmap( const char bits[], int width, int height, int WXUNUSED(depth))
{
m_refData = new wxBitmapRefData();
return M_BMPDATA->m_bpp;
};
-void wxBitmap::SetHeight( const int height )
+void wxBitmap::SetHeight( int height )
{
if (!Ok()) return;
M_BMPDATA->m_height = height;
};
-void wxBitmap::SetWidth( const int width )
+void wxBitmap::SetWidth( int width )
{
if (!Ok()) return;
M_BMPDATA->m_width = width;
};
-void wxBitmap::SetDepth( const int depth )
+void wxBitmap::SetDepth( int depth )
{
if (!Ok()) return;
M_BMPDATA->m_bpp = depth;
M_BMPDATA->m_mask = mask;
};
-bool wxBitmap::SaveFile( const wxString &WXUNUSED(name), const int WXUNUSED(type),
+bool wxBitmap::SaveFile( const wxString &WXUNUSED(name), int WXUNUSED(type),
wxPalette *WXUNUSED(palette) )
{
return FALSE;
};
-bool wxBitmap::LoadFile( const wxString &name, const int WXUNUSED(type) )
+bool wxBitmap::LoadFile( const wxString &name, int WXUNUSED(type) )
{
#ifdef USE_GDK_IMLIB
wxBitmapButton::wxBitmapButton( wxWindow *parent, wxWindowID id, const wxBitmap &bitmap,
const wxPoint &pos, const wxSize &size,
- const long style, const wxString &name )
+ long style, const wxString &name )
{
Create( parent, id, bitmap, pos, size, style, name );
};
bool wxBitmapButton::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bitmap,
const wxPoint &pos, const wxSize &size,
- const long style, const wxString &name )
+ long style, const wxString &name )
{
m_needParent = TRUE;
if (wxTheBrushList) wxTheBrushList->AddBrush( this );
};
-wxBrush::wxBrush( const wxColour &colour, const int style )
+wxBrush::wxBrush( const wxColour &colour, int style )
{
m_refData = new wxBrushRefData();
M_BRUSHDATA->m_style = style;
if (wxTheBrushList) wxTheBrushList->AddBrush( this );
};
-wxBrush::wxBrush( const wxString &colourName, const int style )
+wxBrush::wxBrush( const wxString &colourName, int style )
{
m_refData = new wxBrushRefData();
M_BRUSHDATA->m_style = style;
wxButton::wxButton( wxWindow *parent, wxWindowID id, const wxString &label,
const wxPoint &pos, const wxSize &size,
- const long style, const wxString &name )
+ long style, const wxString &name )
{
Create( parent, id, label, pos, size, style, name );
};
bool wxButton::Create( wxWindow *parent, wxWindowID id, const wxString &label,
const wxPoint &pos, const wxSize &size,
- const long style, const wxString &name )
+ long style, const wxString &name )
{
m_needParent = TRUE;
wxCheckBox::wxCheckBox( wxWindow *parent, wxWindowID id, const wxString &label,
const wxPoint &pos, const wxSize &size,
- const long style, const wxString &name )
+ long style, const wxString &name )
{
Create( parent, id, label, pos, size, style, name );
};
bool wxCheckBox::Create( wxWindow *parent, wxWindowID id, const wxString &label,
const wxPoint &pos, const wxSize &size,
- const long style, const wxString &name )
+ long style, const wxString &name )
{
m_needParent = TRUE;
return TRUE;
};
-void wxCheckBox::SetValue( const bool state )
+void wxCheckBox::SetValue( bool state )
{
if (state)
gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(m_widget), GTK_STATE_ACTIVE );
{
};
-wxChoice::wxChoice( wxWindow *parent, const wxWindowID id,
- const wxPoint &pos, const wxSize &size,
- const int n, const wxString choices[],
- const long style, const wxString &name )
+wxChoice::wxChoice( wxWindow *parent, wxWindowID id,
+ const wxPoint &pos, const wxSize &size,
+ int n, const wxString choices[],
+ long style, const wxString &name )
{
Create( parent, id, pos, size, n, choices, style, name );
};
-bool wxChoice::Create( wxWindow *parent, const wxWindowID id,
- const wxPoint &pos, const wxSize &size,
- const int n, const wxString choices[],
- const long style, const wxString &name )
+bool wxChoice::Create( wxWindow *parent, wxWindowID id,
+ const wxPoint &pos, const wxSize &size,
+ int n, const wxString choices[],
+ long style, const wxString &name )
{
m_needParent = TRUE;
return -1;
};
-wxString wxChoice::GetString( const int n ) const
+wxString wxChoice::GetString( int n ) const
{
GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) );
int count = 0;
return count;
};
-void wxChoice::SetColumns( const int WXUNUSED(n) )
+void wxChoice::SetColumns( int WXUNUSED(n) )
{
};
-void wxChoice::SetSelection( const int n )
+void wxChoice::SetSelection( int n )
{
int tmp = n;
gtk_option_menu_set_history( GTK_OPTION_MENU(m_widget), (gint)tmp );
IMPLEMENT_DYNAMIC_CLASS(wxComboBox,wxControl)
-bool wxComboBox::Create(wxWindow *parent, const wxWindowID id, const wxString& value,
+bool wxComboBox::Create(wxWindow *parent, wxWindowID id, const wxString& value,
const wxPoint& pos, const wxSize& size,
- const int n, const wxString choices[],
- const long style, const wxString& name )
+ int n, const wxString choices[],
+ long style, const wxString& name )
{
m_needParent = TRUE;
{
};
-void wxComboBox::Delete( const int n )
+void wxComboBox::Delete( int n )
{
GtkWidget *list = GTK_COMBO(m_widget)->list;
gtk_list_clear_items( GTK_LIST(list), n, n );
return -1;
};
-char* wxComboBox::GetClientData( const int n )
+char* wxComboBox::GetClientData( int n )
{
wxNode *node = m_clientData.Nth( n );
if (node) return (char*)node->Data();
return NULL;
};
-void wxComboBox::SetClientData( const int n, char * clientData )
+void wxComboBox::SetClientData( int n, char * clientData )
{
wxNode *node = m_clientData.Nth( n );
if (node) node->SetData( (wxObject*) clientData );
return -1;
};
-wxString wxComboBox::GetString( const int n ) const
+wxString wxComboBox::GetString( int n ) const
{
GtkWidget *list = GTK_COMBO(m_widget)->list;
return count;
};
-void wxComboBox::SetSelection( const int n )
+void wxComboBox::SetSelection( int n )
{
GtkWidget *list = GTK_COMBO(m_widget)->list;
gtk_list_select_item( GTK_LIST(list), n );
gtk_editable_paste_clipboard( GTK_EDITABLE(entry), 0 );
};
-void wxComboBox::SetInsertionPoint( const long pos )
+void wxComboBox::SetInsertionPoint( long pos )
{
GtkWidget *entry = GTK_COMBO(m_widget)->entry;
int tmp = (int) pos;
return (long) pos-1;
};
-void wxComboBox::Replace( const long from, const long to, const wxString& value )
+void wxComboBox::Replace( long from, long to, const wxString& value )
{
GtkWidget *entry = GTK_COMBO(m_widget)->entry;
gtk_editable_delete_text( GTK_EDITABLE(entry), (gint)from, (gint)to );
gtk_editable_insert_text( GTK_EDITABLE(entry), value, value.Length(), &pos );
};
-void wxComboBox::Remove(const long from, const long to)
+void wxComboBox::Remove(long from, long to)
{
GtkWidget *entry = GTK_COMBO(m_widget)->entry;
gtk_editable_delete_text( GTK_EDITABLE(entry), (gint)from, (gint)to );
};
-void wxComboBox::SetSelection( const long WXUNUSED(from), const long WXUNUSED(to) )
+void wxComboBox::SetSelection( long WXUNUSED(from), long WXUNUSED(to) )
{
};
-void wxComboBox::SetEditable( const bool WXUNUSED(editable) )
+void wxComboBox::SetEditable( bool WXUNUSED(editable) )
{
};
wxControl::wxControl( wxWindow *parent, wxWindowID id,
const wxPoint &pos, const wxSize &size,
- const long style, const wxString &name ) :
+ long style, const wxString &name ) :
wxWindow( parent, id, pos, size, style, name )
{
};
{
};
-wxCursor::wxCursor( const int cursorId )
+wxCursor::wxCursor( int cursorId )
{
m_refData = new wxCursorRefData();
wxDialog::wxDialog( wxWindow *parent,
wxWindowID id, const wxString &title,
const wxPoint &pos, const wxSize &size,
- const long style, const wxString &name )
+ long style, const wxString &name )
{
wxTopLevelWindows.Insert( this );
Create( parent, id, title, pos, size, style, name );
bool wxDialog::Create( wxWindow *parent,
wxWindowID id, const wxString &title,
const wxPoint &pos, const wxSize &size,
- const long style, const wxString &name )
+ long style, const wxString &name )
{
m_needParent = FALSE;
};
};
-bool wxDialog::Show( const bool show )
+bool wxDialog::Show( bool show )
{
if (!show && m_modalShowing)
{
g_blockEventsOnDrag = FALSE;
};
-void wxDragSource::SetData( char *data, const long size )
+void wxDragSource::SetData( char *data, long size )
{
m_size = size;
m_data = data;
wxTopLevelWindows.Insert( this );
};
-wxFrame::wxFrame( wxWindow *parent, const wxWindowID id, const wxString &title,
- const wxPoint &pos, const wxSize &size,
- const long style, const wxString &name )
+wxFrame::wxFrame( wxWindow *parent, wxWindowID id, const wxString &title,
+ const wxPoint &pos, const wxSize &size,
+ long style, const wxString &name )
{
m_sizeSet = FALSE;
Create( parent, id, title, pos, size, style, name );
wxTopLevelWindows.Insert( this );
};
-bool wxFrame::Create( wxWindow *parent, const wxWindowID id, const wxString &title,
+bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title,
const wxPoint &pos, const wxSize &size,
- const long style, const wxString &name )
+ long style, const wxString &name )
{
m_needParent = FALSE;
m_mainWindow = NULL;
if (wxTopLevelWindows.Number() == 0) wxTheApp->ExitMainLoop();
};
-bool wxFrame::Show( const bool show )
+bool wxFrame::Show( bool show )
{
if (show)
{
return wxWindow::Show( show );
};
-void wxFrame::Enable( const bool enable )
+void wxFrame::Enable( bool enable )
{
wxWindow::Enable( enable );
gtk_widget_set_sensitive( m_mainWindow, enable );
m_frameMenuBar->m_widget, m_frameMenuBar->m_x, m_frameMenuBar->m_y );
};
-bool wxFrame::CreateStatusBar( const int number )
+bool wxFrame::CreateStatusBar( int number )
{
if (m_frameStatusBar)
delete m_frameStatusBar;
return TRUE;
};
-void wxFrame::SetStatusText( const wxString &text, const int number )
+void wxFrame::SetStatusText( const wxString &text, int number )
{
if (m_frameStatusBar) m_frameStatusBar->SetStatusText( text, number );
};
-void wxFrame::SetStatusWidths( const int n, const int *width )
+void wxFrame::SetStatusWidths( int n, int *width )
{
if (m_frameStatusBar) m_frameStatusBar->SetStatusWidths( n, width );
};
IMPLEMENT_DYNAMIC_CLASS(wxGauge,wxControl)
-bool wxGauge::Create( wxWindow *parent, const wxWindowID id, const int range,
+bool wxGauge::Create( wxWindow *parent, wxWindowID id, int range,
const wxPoint& pos, const wxSize& size,
- const long style, const wxString& name )
+ long style, const wxString& name )
{
m_needParent = TRUE;
return TRUE;
};
-void wxGauge::SetRange( const int r )
+void wxGauge::SetRange( int r )
{
m_rangeMax = r;
if (m_gaugePos > m_rangeMax) m_gaugePos = m_rangeMax;
gtk_progress_bar_update( GTK_PROGRESS_BAR(m_widget), (float)(m_rangeMax/m_gaugePos) );
};
-void wxGauge::SetValue( const int pos )
+void wxGauge::SetValue( int pos )
{
m_gaugePos = pos;
if (m_gaugePos > m_rangeMax) m_gaugePos = m_rangeMax;
wxListBox::wxListBox( wxWindow *parent, wxWindowID id,
const wxPoint &pos, const wxSize &size,
- const int n, const wxString choices[],
- const long style, const wxString &name )
+ int n, const wxString choices[],
+ long style, const wxString &name )
{
Create( parent, id, pos, size, n, choices, style, name );
};
bool wxListBox::Create( wxWindow *parent, wxWindowID id,
const wxPoint &pos, const wxSize &size,
- const int n, const wxString choices[],
- const long style, const wxString &name )
+ int n, const wxString choices[],
+ long style, const wxString &name )
{
m_needParent = TRUE;
return -1;
};
-char *wxListBox::GetClientData( const int WXUNUSED(n) ) const
+char *wxListBox::GetClientData( int WXUNUSED(n) ) const
{
wxFAIL_MSG("wxListBox::GetClientData not implemented");
return count;
};
-bool wxListBox::Selected( const int n )
+bool wxListBox::Selected( int n )
{
GList *target = g_list_nth( m_list->children, n );
if (target)
return FALSE;
};
-void wxListBox::Set( const int WXUNUSED(n), const wxString *WXUNUSED(choices) )
+void wxListBox::Set( int WXUNUSED(n), const wxString *WXUNUSED(choices) )
{
};
-void wxListBox::SetClientData( const int WXUNUSED(n), char *WXUNUSED(clientData) )
+void wxListBox::SetClientData( int WXUNUSED(n), char *WXUNUSED(clientData) )
{
};
{
};
-void wxListBox::SetSelection( const int n, const bool select )
+void wxListBox::SetSelection( int n, bool select )
{
if (select)
gtk_list_select_item( m_list, n );
gtk_list_unselect_item( m_list, n );
};
-void wxListBox::SetString( const int WXUNUSED(n), const wxString &WXUNUSED(string) )
+void wxListBox::SetString( int WXUNUSED(n), const wxString &WXUNUSED(string) )
{
};
-void wxListBox::SetStringSelection( const wxString &string, const bool select )
+void wxListBox::SetStringSelection( const wxString &string, bool select )
{
SetSelection( FindString(string), select );
};
};
wxMDIParentFrame::wxMDIParentFrame( wxWindow *parent,
- const wxWindowID id, const wxString& title,
+ wxWindowID id, const wxString& title,
const wxPoint& pos, const wxSize& size,
- const long style, const wxString& name )
+ long style, const wxString& name )
{
m_clientWindow = NULL;
m_currentChild = NULL;
};
bool wxMDIParentFrame::Create( wxWindow *parent,
- const wxWindowID id, const wxString& title,
+ wxWindowID id, const wxString& title,
const wxPoint& pos, const wxSize& size,
- const long style, const wxString& name )
+ long style, const wxString& name )
{
wxFrame::Create( parent, id, title, pos, size, style, name );
};
wxMDIChildFrame::wxMDIChildFrame( wxMDIParentFrame *parent,
- const wxWindowID id, const wxString& title,
+ wxWindowID id, const wxString& title,
const wxPoint& pos, const wxSize& size,
- const long style, const wxString& name )
+ long style, const wxString& name )
{
Create( parent, id, title, pos, size, style, name );
};
};
bool wxMDIChildFrame::Create( wxMDIParentFrame *parent,
- const wxWindowID id, const wxString& title,
+ wxWindowID id, const wxString& title,
const wxPoint& pos, const wxSize& size,
- const long style, const wxString& name )
+ long style, const wxString& name )
{
m_title = title;
return wxPanel::Create( parent->GetClientWindow(), id, pos, size, style, name );
{
};
-wxMDIClientWindow::wxMDIClientWindow( wxMDIParentFrame *parent, const long style )
+wxMDIClientWindow::wxMDIClientWindow( wxMDIParentFrame *parent, long style )
{
CreateClient( parent, style );
};
{
};
-bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, const long style )
+bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style )
{
m_needParent = TRUE;
m_items.Append( mitem );
};
-void wxMenu::Append( const int id, const wxString &item, const wxString &helpStr, const bool checkable )
+void wxMenu::Append( int id, const wxString &item, const wxString &helpStr, bool checkable )
{
wxMenuItem *mitem = new wxMenuItem();
mitem->m_id = id;
m_items.Append( mitem );
};
-void wxMenu::Append( const int id, const wxString &item, wxMenu *subMenu, const wxString &helpStr )
+void wxMenu::Append( int id, const wxString &item, wxMenu *subMenu, const wxString &helpStr )
{
wxMenuItem *mitem = new wxMenuItem();
mitem->m_id = id;
return -1;
};
-void wxMenu::Enable( const int id, const bool enable )
+void wxMenu::Enable( int id, bool enable )
{
wxNode *node = m_items.First();
while (node)
};
};
-bool wxMenu::Enabled( const int id ) const
+bool wxMenu::Enabled( int id ) const
{
wxNode *node = m_items.First();
while (node)
return FALSE;
};
-void wxMenu::SetLabel( const int id, const wxString &label )
+void wxMenu::SetLabel( int id, const wxString &label )
{
wxString s( label );
size_t pos;
Init();
};
-wxNotebook::wxNotebook( wxWindow *parent, const wxWindowID id,
+wxNotebook::wxNotebook( wxWindow *parent, wxWindowID id,
const wxPoint& pos, const wxSize& size,
- const long style, const wxString& name )
+ long style, const wxString& name )
{
Init();
Create( parent, id, pos, size, style, name );
DeleteAllPages();
};
-bool wxNotebook::Create(wxWindow *parent, const wxWindowID id,
+bool wxNotebook::Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos, const wxSize& size,
- const long style, const wxString& name )
+ long style, const wxString& name )
{
m_needParent = TRUE;
return TRUE;
};
-bool wxNotebook::SetPageImage( int page, const int image )
+bool wxNotebook::SetPageImage( int page, int image )
{
wxNotebookPage* nb_page = GetNotebookPage(page);
if (!nb_page)
{
};
-wxPalette::wxPalette( const int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue )
+wxPalette::wxPalette( int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue )
{
m_refData = new wxPaletteRefData();
Create( n, red, green, blue );
return (m_refData);
};
-bool wxPalette::Create( const int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue)
+bool wxPalette::Create( int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue)
{
};
{
};
-bool wxPalette::GetRGB( const int pixel, unsigned char *red, unsigned char *green, unsigned char *blue ) const
+bool wxPalette::GetRGB( int pixel, unsigned char *red, unsigned char *green, unsigned char *blue ) const
{
};
M_PENDATA->m_colour = colourName;
};
-void wxPen::SetColour( const int red, const int green, const int blue )
+void wxPen::SetColour( int red, int green, int blue )
{
if (!m_refData)
m_refData = new wxPenRefData();
{
};
-wxRadioBox::wxRadioBox( wxWindow *parent, const wxWindowID id, const wxString& title,
- const wxPoint &pos, const wxSize &size,
- const int n, const wxString choices[],
- const int majorDim, const long style,
+wxRadioBox::wxRadioBox( wxWindow *parent, wxWindowID id, const wxString& title,
+ const wxPoint &pos, const wxSize &size,
+ int n, const wxString choices[],
+ int majorDim, long style,
const wxString &name )
{
Create( parent, id, title, pos, size, n, choices, majorDim, style, name );
};
-bool wxRadioBox::Create( wxWindow *parent, const wxWindowID id, const wxString& title,
- const wxPoint &pos, const wxSize &size,
- const int n, const wxString choices[],
- const int WXUNUSED(majorDim), const long style,
+bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
+ const wxPoint &pos, const wxSize &size,
+ int n, const wxString choices[],
+ int WXUNUSED(majorDim), long style,
const wxString &name )
{
m_needParent = TRUE;
return TRUE;
};
-bool wxRadioBox::Show( const bool show )
+bool wxRadioBox::Show( bool show )
{
wxWindow::Show( show );
return 0;
};
-void wxRadioBox::SetSelection( const int WXUNUSED(n) )
+void wxRadioBox::SetSelection( int WXUNUSED(n) )
{
};
return -1;
};
-wxString wxRadioBox::GetString( const int WXUNUSED(n) ) const
+wxString wxRadioBox::GetString( int WXUNUSED(n) ) const
{
return "";
};
{
};
-void wxRadioBox::SetLabel( const int WXUNUSED(item), const wxString& WXUNUSED(label) )
+void wxRadioBox::SetLabel( int WXUNUSED(item), const wxString& WXUNUSED(label) )
{
};
-void wxRadioBox::SetLabel( const int WXUNUSED(item), wxBitmap *WXUNUSED(bitmap) )
+void wxRadioBox::SetLabel( int WXUNUSED(item), wxBitmap *WXUNUSED(bitmap) )
{
};
-wxString wxRadioBox::GetLabel( const int WXUNUSED(item) ) const
+wxString wxRadioBox::GetLabel( int WXUNUSED(item) ) const
{
return "";
};
-void wxRadioBox::Enable( const bool WXUNUSED(enable) )
+void wxRadioBox::Enable( bool WXUNUSED(enable) )
{
};
-void wxRadioBox::Enable( const int WXUNUSED(item), const bool WXUNUSED(enable) )
+void wxRadioBox::Enable( int WXUNUSED(item), bool WXUNUSED(enable) )
{
};
-void wxRadioBox::Show( const int WXUNUSED(item), const bool WXUNUSED(show) )
+void wxRadioBox::Show( int WXUNUSED(item), bool WXUNUSED(show) )
{
};
return 1;
};
-void wxRadioBox::SetNumberOfRowsOrCols( const int WXUNUSED(n) )
+void wxRadioBox::SetNumberOfRowsOrCols( int WXUNUSED(n) )
{
};
IMPLEMENT_DYNAMIC_CLASS(wxScrollBar,wxControl)
-wxScrollBar::wxScrollBar(wxWindow *parent, const wxWindowID id,
+wxScrollBar::wxScrollBar(wxWindow *parent, wxWindowID id,
const wxPoint& pos, const wxSize& size,
- const long style, const wxString& name )
+ long style, const wxString& name )
{
Create( parent, id, pos, size, style, name );
};
{
};
-bool wxScrollBar::Create(wxWindow *parent, const wxWindowID id,
+bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos, const wxSize& size,
- const long style, const wxString& name )
+ long style, const wxString& name )
{
m_needParent = TRUE;
return (int)(m_adjust->upper+0.5);
};
-void wxScrollBar::SetPosition( const int viewStart )
+void wxScrollBar::SetPosition( int viewStart )
{
float fpos = (float)viewStart;
m_oldPos = fpos;
gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" );
};
-void wxScrollBar::SetScrollbar( const int position, const int thumbSize, const int range, const int pageSize,
- const bool WXUNUSED(refresh) )
+void wxScrollBar::SetScrollbar( int position, int thumbSize, int range, int pageSize,
+ bool WXUNUSED(refresh) )
{
float fpos = (float)position;
m_oldPos = fpos;
return GetPosition();
};
-void wxScrollBar::SetValue( const int viewStart )
+void wxScrollBar::SetValue( int viewStart )
{
SetPosition( viewStart );
};
return (int)(m_adjust->page_size+0.5);
};
-void wxScrollBar::SetPageSize( const int pageLength )
+void wxScrollBar::SetPageSize( int pageLength )
{
int pos = (int)(m_adjust->value+0.5);
int thumb = (int)(m_adjust->page_size+0.5);
SetScrollbar( pos, thumb, range, pageLength );
};
-void wxScrollBar::SetObjectLength( const int objectLength )
+void wxScrollBar::SetObjectLength( int objectLength )
{
int pos = (int)(m_adjust->value+0.5);
int page = (int)(m_adjust->page_increment+0.5);
SetScrollbar( pos, objectLength, range, page );
};
-void wxScrollBar::SetViewLength( const int viewLength )
+void wxScrollBar::SetViewLength( int viewLength )
{
int pos = (int)(m_adjust->value+0.5);
int thumb = (int)(m_adjust->page_size+0.5);
{
};
-wxSlider::wxSlider( wxWindow *parent, const wxWindowID id,
- const int value, const int minValue, const int maxValue,
+wxSlider::wxSlider( wxWindow *parent, wxWindowID id,
+ int value, int minValue, int maxValue,
const wxPoint& pos, const wxSize& size,
- const long style,
+ long style,
/* const wxValidator& validator = wxDefaultValidator, */
const wxString& name )
{
{
};
-bool wxSlider::Create(wxWindow *parent, const wxWindowID id,
- const int value, const int minValue, const int maxValue,
+bool wxSlider::Create(wxWindow *parent, wxWindowID id,
+ int value, int minValue, int maxValue,
const wxPoint& pos, const wxSize& size,
- const long style,
+ long style,
/* const wxValidator& validator = wxDefaultValidator, */
const wxString& name )
{
return (int)(m_adjust->value+0.5);
};
-void wxSlider::SetValue( const int value )
+void wxSlider::SetValue( int value )
{
float fpos = (float)value;
m_oldPos = fpos;
gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" );
};
-void wxSlider::SetRange( const int minValue, const int maxValue )
+void wxSlider::SetRange( int minValue, int maxValue )
{
float fmin = (float)minValue;
float fmax = (float)maxValue;
return (int)(m_adjust->upper+0.5);
};
-void wxSlider::SetPageSize( const int pageSize )
+void wxSlider::SetPageSize( int pageSize )
{
float fpage = (float)pageSize;
return (int)(m_adjust->page_increment+0.5);
};
-void wxSlider::SetThumbLength( const int len )
+void wxSlider::SetThumbLength( int len )
{
float flen = (float)len;
return (int)(m_adjust->page_size+0.5);
};
-void wxSlider::SetLineSize( const int WXUNUSED(lineSize) )
+void wxSlider::SetLineSize( int WXUNUSED(lineSize) )
{
};
wxWindow::GetSize( x, y );
};
-void wxSlider::SetSize( const int x, const int y, const int width, const int height, const int sizeFlags )
+void wxSlider::SetSize( int x, int y, int width, int height, int sizeFlags )
{
wxWindow::SetSize( x, y, width, height, sizeFlags );
};
wxWindow::GetPosition( x, y );
};
-void wxSlider::SetTick( const int WXUNUSED(tickPos) )
+void wxSlider::SetTick( int WXUNUSED(tickPos) )
{
};
-void wxSlider::SetTickFreq( const int WXUNUSED(n), const int WXUNUSED(pos) )
+void wxSlider::SetTickFreq( int WXUNUSED(n), int WXUNUSED(pos) )
{
};
{
};
-void wxSlider::SetSelection( const int WXUNUSED(minPos), const int WXUNUSED(maxPos) )
+void wxSlider::SetSelection( int WXUNUSED(minPos), int WXUNUSED(maxPos) )
{
};
wxStaticBitmap::wxStaticBitmap( wxWindow *parent, wxWindowID id, const wxBitmap &bitmap,
const wxPoint &pos, const wxSize &size,
- const long style, const wxString &name )
+ long style, const wxString &name )
{
Create( parent, id, bitmap, pos, size, style, name );
};
bool wxStaticBitmap::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bitmap,
const wxPoint &pos, const wxSize &size,
- const long style, const wxString &name )
+ long style, const wxString &name )
{
m_needParent = TRUE;
wxStaticBox::wxStaticBox( wxWindow *parent, wxWindowID id, const wxString &label,
const wxPoint &pos, const wxSize &size,
- const long style, const wxString &name )
+ long style, const wxString &name )
{
Create( parent, id, label, pos, size, style, name );
};
bool wxStaticBox::Create( wxWindow *parent, wxWindowID id, const wxString &label,
const wxPoint &pos, const wxSize &size,
- const long style, const wxString &name )
+ long style, const wxString &name )
{
m_needParent = TRUE;
wxStaticText::wxStaticText( wxWindow *parent, wxWindowID id, const wxString &label,
const wxPoint &pos, const wxSize &size,
- const long style, const wxString &name )
+ long style, const wxString &name )
{
Create( parent, id, label, pos, size, style, name );
};
bool wxStaticText::Create( wxWindow *parent, wxWindowID id, const wxString &label,
const wxPoint &pos, const wxSize &size,
- const long style, const wxString &name )
+ long style, const wxString &name )
{
m_needParent = TRUE;
IMPLEMENT_DYNAMIC_CLASS(wxToolBarTool,wxObject)
-wxToolBarTool::wxToolBarTool( wxToolBarGTK *owner, const int theIndex,
- const wxBitmap& bitmap1, const wxBitmap& bitmap2,
- const bool toggle, wxObject *clientData,
+wxToolBarTool::wxToolBarTool( wxToolBarGTK *owner, int theIndex,
+ const wxBitmap& bitmap1, const wxBitmap& bitmap2,
+ bool toggle, wxObject *clientData,
const wxString& shortHelpString, const wxString& longHelpString )
{
m_owner = owner;
{
};
-wxToolBarGTK::wxToolBarGTK( wxWindow *parent, const wxWindowID id,
+wxToolBarGTK::wxToolBarGTK( wxWindow *parent, wxWindowID id,
const wxPoint& pos, const wxSize& size,
- const long style, const wxString& name )
+ long style, const wxString& name )
{
Create( parent, id, pos, size, style, name );
};
{
};
-bool wxToolBarGTK::Create( wxWindow *parent, const wxWindowID id,
+bool wxToolBarGTK::Create( wxWindow *parent, wxWindowID id,
const wxPoint& pos, const wxSize& size,
- const long style, const wxString& name )
+ long style, const wxString& name )
{
m_needParent = TRUE;
GetEventHandler()->ProcessEvent(event);
};
-wxToolBarTool *wxToolBarGTK::AddTool( const int toolIndex, const wxBitmap& bitmap,
- const wxBitmap& pushedBitmap, const bool toggle,
- const float WXUNUSED(xPos), const float WXUNUSED(yPos), wxObject *clientData,
+wxToolBarTool *wxToolBarGTK::AddTool( int toolIndex, const wxBitmap& bitmap,
+ const wxBitmap& pushedBitmap, bool toggle,
+ float WXUNUSED(xPos), float WXUNUSED(yPos), wxObject *clientData,
const wxString& helpString1, const wxString& helpString2 )
{
if (!bitmap.Ok()) return NULL;
{
};
-void wxToolBarGTK::EnableTool(const int toolIndex, const bool enable)
+void wxToolBarGTK::EnableTool(int toolIndex, bool enable)
{
};
-void wxToolBarGTK::ToggleTool(const int toolIndex, const bool toggle)
+void wxToolBarGTK::ToggleTool(int toolIndex, bool toggle)
{
};
-void wxToolBarGTK::SetToggle(const int toolIndex, const bool toggle)
+void wxToolBarGTK::SetToggle(int toolIndex, bool toggle)
{
};
-wxObject *wxToolBarGTK::GetToolClientData(const int index) const
+wxObject *wxToolBarGTK::GetToolClientData(int index) const
{
};
-bool wxToolBarGTK::GetToolState(const int toolIndex) const
+bool wxToolBarGTK::GetToolState(int toolIndex) const
{
};
-bool wxToolBarGTK::GetToolEnabled(const int toolIndex) const
+bool wxToolBarGTK::GetToolEnabled(int toolIndex) const
{
};
-void wxToolBarGTK::SetMargins(const int x, const int y)
+void wxToolBarGTK::SetMargins(int x, int y)
{
};
-void wxToolBarGTK::SetToolPacking(const int packing)
+void wxToolBarGTK::SetToolPacking(int packing)
{
};
-void wxToolBarGTK::SetToolSeparation(const int separation)
+void wxToolBarGTK::SetToolSeparation(int separation)
{
};
m_modified = FALSE;
};
-wxTextCtrl::wxTextCtrl( wxWindow *parent, const wxWindowID id, const wxString &value,
+wxTextCtrl::wxTextCtrl( wxWindow *parent, wxWindowID id, const wxString &value,
const wxPoint &pos, const wxSize &size,
- const int style, const wxString &name ) : streambuf()
+ int style, const wxString &name ) : streambuf()
{
m_modified = FALSE;
Create( parent, id, value, pos, size, style, name );
};
-bool wxTextCtrl::Create( wxWindow *parent, const wxWindowID id, const wxString &value,
+bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
const wxPoint &pos, const wxSize &size,
- const int style, const wxString &name )
+ int style, const wxString &name )
{
m_needParent = TRUE;
};
/*
-wxString wxTextCtrl::GetLineText( const long lineNo ) const
+wxString wxTextCtrl::GetLineText( long lineNo ) const
{
};
{
};
-long wxTextCtrl::PositionToXY( const long pos, long *x, long *y ) const
+long wxTextCtrl::PositionToXY( long pos, long *x, long *y ) const
{
};
-long wxTextCtrl::XYToPosition( const long x, const long y )
+long wxTextCtrl::XYToPosition( long x, long y )
{
};
};
*/
-void wxTextCtrl::SetInsertionPoint( const long pos )
+void wxTextCtrl::SetInsertionPoint( long pos )
{
int tmp = (int) pos;
if (m_windowStyle & wxTE_MULTILINE)
SetInsertionPoint( pos-1 );
};
-void wxTextCtrl::SetEditable( const bool editable )
+void wxTextCtrl::SetEditable( bool editable )
{
if (m_windowStyle & wxTE_MULTILINE)
gtk_text_set_editable( GTK_TEXT(m_widget), editable );
gtk_entry_set_editable( GTK_ENTRY(m_widget), editable );
};
-void wxTextCtrl::SetSelection( const long from, const long to )
+void wxTextCtrl::SetSelection( long from, long to )
{
gtk_editable_select_region( GTK_EDITABLE(m_widget), (gint)from, (gint)to );
};
-void wxTextCtrl::ShowPosition( const long WXUNUSED(pos) )
+void wxTextCtrl::ShowPosition( long WXUNUSED(pos) )
{
wxFAIL_MSG("wxTextCtrl::ShowPosition not implemented");
};
return (long)pos-1;
};
-void wxTextCtrl::Remove( const long from, const long to )
+void wxTextCtrl::Remove( long from, long to )
{
gtk_editable_delete_text( GTK_EDITABLE(m_widget), (gint)from, (gint)to );
};
-void wxTextCtrl::Replace( const long from, const long to, const wxString &value )
+void wxTextCtrl::Replace( long from, long to, const wxString &value )
{
gtk_editable_delete_text( GTK_EDITABLE(m_widget), (gint)from, (gint)to );
if (value.IsNull()) return;
return *this;
}
-wxTextCtrl& wxTextCtrl::operator<<(const float f)
+wxTextCtrl& wxTextCtrl::operator<<(float f)
{
static char buf[100];
sprintf(buf, "%.2f", f);
return *this;
}
-wxTextCtrl& wxTextCtrl::operator<<(const double d)
+wxTextCtrl& wxTextCtrl::operator<<(double d)
{
static char buf[100];
sprintf(buf, "%.2f", d);
return *this;
}
-wxTextCtrl& wxTextCtrl::operator<<(const int i)
+wxTextCtrl& wxTextCtrl::operator<<(int i)
{
static char buf[100];
sprintf(buf, "%i", i);
return *this;
}
-wxTextCtrl& wxTextCtrl::operator<<(const long i)
+wxTextCtrl& wxTextCtrl::operator<<(long i)
{
static char buf[100];
sprintf(buf, "%ld", i);
m_pDropTarget = NULL;
};
-wxWindow::wxWindow( wxWindow *parent, const wxWindowID id,
- const wxPoint &pos, const wxSize &size,
- const long style, const wxString &name )
+wxWindow::wxWindow( wxWindow *parent, wxWindowID id,
+ const wxPoint &pos, const wxSize &size,
+ long style, const wxString &name )
{
Create( parent, id, pos, size, style, name );
};
-bool wxWindow::Create( wxWindow *parent, const wxWindowID id,
- const wxPoint &pos, const wxSize &size,
- const long style, const wxString &name )
+bool wxWindow::Create( wxWindow *parent, wxWindowID id,
+ const wxPoint &pos, const wxSize &size,
+ long style, const wxString &name )
{
m_isShown = FALSE;
m_isEnabled = TRUE;
};
-void wxWindow::PreCreation( wxWindow *parent, const wxWindowID id,
- const wxPoint &pos, const wxSize &size,
- const long style, const wxString &name )
+void wxWindow::PreCreation( wxWindow *parent, wxWindowID id,
+ const wxPoint &pos, const wxSize &size,
+ long style, const wxString &name )
{
if (m_needParent && (parent == NULL))
wxFatalError( "Need complete parent.", name );
return m_hasVMT;
};
-bool wxWindow::Close( const bool force )
+bool wxWindow::Close( bool force )
{
wxCloseEvent event(wxEVT_CLOSE_WINDOW, m_windowId);
event.SetEventObject(this);
gtk_widget_set_uposition( m_widget, m_x, m_y );
};
-void wxWindow::SetSize( const int x, const int y, const int width, const int height, const int sizeFlags )
+void wxWindow::SetSize( int x, int y, int width, int height, int sizeFlags )
{
int newX = x;
int newY = y;
ProcessEvent( event );
};
-void wxWindow::SetSize( const int width, const int height )
+void wxWindow::SetSize( int width, int height )
{
SetSize( -1, -1, width, height, wxSIZE_USE_EXISTING );
};
-void wxWindow::Move( const int x, const int y )
+void wxWindow::Move( int x, int y )
{
SetSize( x, y, -1, -1, wxSIZE_USE_EXISTING );
};
(*height) = m_height;
};
-void wxWindow::SetClientSize( const int width, const int height )
+void wxWindow::SetClientSize( int width, int height )
{
if (!m_wxwindow)
{
if (y) *y -= org_y;
};
-void wxWindow::Centre( const int direction )
+void wxWindow::Centre( int direction )
{
int x = 0;
int y = 0;
if (GetAutoLayout()) Layout();
};
-bool wxWindow::Show( const bool show )
+bool wxWindow::Show( bool show )
{
if (show)
gtk_widget_show( m_widget );
return TRUE;
};
-void wxWindow::Enable( const bool enable )
+void wxWindow::Enable( bool enable )
{
m_isEnabled = enable;
gtk_widget_set_sensitive( m_widget, enable );
if (m_wxwindow) gtk_widget_set_sensitive( m_wxwindow, enable );
};
-void wxWindow::MakeModal( const bool modal )
+void wxWindow::MakeModal( bool modal )
{
return;
// Disable all other windows
gdk_window_set_cursor( m_wxwindow->window, m_cursor->GetCursor() );
};
-void wxWindow::Refresh( const bool eraseBackground, const wxRect *rect )
+void wxWindow::Refresh( bool eraseBackground, const wxRect *rect )
{
if (eraseBackground && m_wxwindow && m_wxwindow->window)
{
};
};
-bool wxWindow::IsExposed( const long x, const long y )
+bool wxWindow::IsExposed( long x, long y )
{
return (m_updateRegion.Contains( x, y ) != wxOutRegion );
};
-bool wxWindow::IsExposed( const long x, const long y, const long width, const long height )
+bool wxWindow::IsExposed( long x, long y, long width, long height )
{
return (m_updateRegion.Contains( x, y, width, height ) != wxOutRegion );
};
return FALSE;
};
-wxWindow *wxWindow::FindWindow( const long id )
+wxWindow *wxWindow::FindWindow( long id )
{
if (id == m_windowId) return this;
wxNode *node = m_children.First();
return NULL;
};
-void wxWindow::SetScrollbar( const int orient, const int pos, const int thumbVisible,
- const int range, const bool WXUNUSED(refresh) )
+void wxWindow::SetScrollbar( int orient, int pos, int thumbVisible,
+ int range, bool WXUNUSED(refresh) )
{
if (!m_wxwindow) return;
};
};
-void wxWindow::SetScrollPos( const int orient, const int pos, const bool WXUNUSED(refresh) )
+void wxWindow::SetScrollPos( int orient, int pos, bool WXUNUSED(refresh) )
{
if (!m_wxwindow) return;
};
};
-int wxWindow::GetScrollThumb( const int orient ) const
+int wxWindow::GetScrollThumb( int orient ) const
{
if (!m_wxwindow) return 0;
return (int)(m_vAdjust->page_size+0.5);
};
-int wxWindow::GetScrollPos( const int orient ) const
+int wxWindow::GetScrollPos( int orient ) const
{
if (!m_wxwindow) return 0;
return (int)(m_vAdjust->value+0.5);
};
-int wxWindow::GetScrollRange( const int orient ) const
+int wxWindow::GetScrollRange( int orient ) const
{
if (!m_wxwindow) return 0;
return (int)(m_vAdjust->upper+0.5);
};
-void wxWindow::ScrollWindow( const int dx, const int dy, const wxRect* WXUNUSED(rect) )
+void wxWindow::ScrollWindow( int dx, int dy, const wxRect* WXUNUSED(rect) )
{
if (!m_wxwindow) return;
}
;
-void wxWindow::SetAutoLayout( const bool autoLayout )
+void wxWindow::SetAutoLayout( bool autoLayout )
{
m_autoLayout = autoLayout;
};
}
// Do a phase of evaluating child constraints
-bool wxWindow::DoPhase(const int phase)
+bool wxWindow::DoPhase(int phase)
{
int noIterations = 0;
int maxIterations = 500;
// Need to distinguish between setting the 'fake' size for
// windows and sizers, and setting the real values.
-void wxWindow::SetConstraintSizes(const bool recurse)
+void wxWindow::SetConstraintSizes(bool recurse)
{
wxLayoutConstraints *constr = GetConstraints();
if (constr && constr->left.GetDone() && constr->right.GetDone() &&
*y += yp;
}
-void wxWindow::SizerSetSize(const int x, const int y, const int w, const int h)
+void wxWindow::SizerSetSize(int x, int y, int w, int h)
{
int xx = x;
int yy = y;
SetSize(xx, yy, w, h);
}
-void wxWindow::SizerMove(const int x, const int y)
+void wxWindow::SizerMove(int x, int y)
{
int xx = x;
int yy = y;
}
// Only set the size/position of the constraint (if any)
-void wxWindow::SetSizeConstraint(const int x, const int y, const int w, const int h)
+void wxWindow::SetSizeConstraint(int x, int y, int w, int h)
{
wxLayoutConstraints *constr = GetConstraints();
if (constr)
}
}
-void wxWindow::MoveConstraint(const int x, const int y)
+void wxWindow::MoveConstraint(int x, int y)
{
wxLayoutConstraints *constr = GetConstraints();
if (constr)
return needMore ;
}
-// Windows specific. Intercept keyboard input: by default,
-// route it to the active frame or dialog box.
-#if WXWIN_COMPATIBILITY == 2
-bool wxApp::OldOnCharHook(wxKeyEvent& event)
-{
- wxWindow *win = wxGetActiveWindow();
- if (win)
- return win->GetEventHandler()->OldOnCharHook(event);
- else
- return FALSE;
-}
-#endif
-
void wxApp::DeletePendingObjects(void)
{
wxNode *node = wxPendingDelete.First();
}
-wxBitmap::wxBitmap(const char bits[], const int the_width, const int the_height, const int no_bits)
+wxBitmap::wxBitmap(const char bits[], int the_width, int the_height, int no_bits)
{
m_refData = new wxBitmapRefData;
wxTheBitmapList->AddBitmap(this);
}
-wxBitmap::wxBitmap(const int w, const int h, const int d)
+wxBitmap::wxBitmap(int w, int h, int d)
{
(void)Create(w, h, d);
wxTheBitmapList->AddBitmap(this);
}
-wxBitmap::wxBitmap(void *data, const long type, const int width, const int height, const int depth)
+wxBitmap::wxBitmap(void *data, long type, int width, int height, int depth)
{
(void) Create(data, type, width, height, depth);
wxTheBitmapList->AddBitmap(this);
}
-wxBitmap::wxBitmap(const wxString& filename, const long type)
+wxBitmap::wxBitmap(const wxString& filename, long type)
{
LoadFile(filename, (int)type);
}
#endif
-bool wxBitmap::Create(const int w, const int h, const int d)
+bool wxBitmap::Create(int w, int h, int d)
{
UnRef();
return M_BITMAPDATA->m_ok;
}
-bool wxBitmap::LoadFile(const wxString& filename, const long type)
+bool wxBitmap::LoadFile(const wxString& filename, long type)
{
UnRef();
return handler->LoadFile(this, filename, type, -1, -1);
}
-bool wxBitmap::Create(void *data, const long type, const int width, const int height, const int depth)
+bool wxBitmap::Create(void *data, long type, int width, int height, int depth)
{
UnRef();
return handler->Create(this, data, type, width, height, depth);
}
-bool wxBitmap::SaveFile(const wxString& filename, const int type, const wxPalette *palette)
+bool wxBitmap::SaveFile(const wxString& filename, int type, const wxPalette *palette)
{
wxBitmapHandler *handler = FindHandler(type);
// Construct a mask from a bitmap and a palette index indicating
// the transparent area
-wxMask::wxMask(const wxBitmap& bitmap, const int paletteIndex)
+wxMask::wxMask(const wxBitmap& bitmap, int paletteIndex)
{
m_maskBitmap = 0;
Create(bitmap, paletteIndex);
// Create a mask from a bitmap and a palette index indicating
// the transparent area
-bool wxMask::Create(const wxBitmap& bitmap, const int paletteIndex)
+bool wxMask::Create(const wxBitmap& bitmap, int paletteIndex)
{
if ( m_maskBitmap )
{
IMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler, wxObject)
-bool wxBitmapHandler::Create(wxBitmap *bitmap, void *data, const long type, const int width, const int height, const int depth)
+bool wxBitmapHandler::Create(wxBitmap *bitmap, void *data, long type, int width, int height, int depth)
{
return FALSE;
}
-bool wxBitmapHandler::LoadFile(wxBitmap *bitmap, const wxString& name, const long type,
+bool wxBitmapHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long type,
int desiredWidth, int desiredHeight)
{
return FALSE;
}
-bool wxBitmapHandler::SaveFile(wxBitmap *bitmap, const wxString& name, const int type, const wxPalette *palette)
+bool wxBitmapHandler::SaveFile(wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette)
{
return FALSE;
}
m_type = wxBITMAP_TYPE_BMP_RESOURCE;
};
- 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);
};
IMPLEMENT_DYNAMIC_CLASS(wxBMPResourceHandler, wxBitmapHandler)
-bool wxBMPResourceHandler::LoadFile(wxBitmap *bitmap, const wxString& name, const long flags,
+bool wxBMPResourceHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
int desiredWidth, int desiredHeight)
{
// TODO: load colourmap.
m_type = wxBITMAP_TYPE_BMP;
};
- 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);
- 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);
};
IMPLEMENT_DYNAMIC_CLASS(wxBMPFileHandler, wxBitmapHandler)
-bool wxBMPFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, const long flags,
+bool wxBMPFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
int desiredWidth, int desiredHeight)
{
#if USE_IMAGE_LOADING_IN_MSW
#endif
}
-bool wxBMPFileHandler::SaveFile(wxBitmap *bitmap, const wxString& name, const int type, const wxPalette *pal)
+bool wxBMPFileHandler::SaveFile(wxBitmap *bitmap, const wxString& name, int type, const wxPalette *pal)
{
#if USE_IMAGE_LOADING_IN_MSW
wxPalette *actualPalette = (wxPalette *)pal;
m_type = wxBITMAP_TYPE_XPM;
};
- 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);
- 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);
};
IMPLEMENT_DYNAMIC_CLASS(wxXPMFileHandler, wxBitmapHandler)
-bool wxXPMFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, const long flags,
+bool wxXPMFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
int desiredWidth, int desiredHeight)
{
#if USE_XPM_IN_MSW
return FALSE;
}
-bool wxXPMFileHandler::SaveFile(wxBitmap *bitmap, const wxString& name, const int type, const wxPalette *palette)
+bool wxXPMFileHandler::SaveFile(wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette)
{
#if USE_XPM_IN_MSW
HDC dc = NULL;
m_type = wxBITMAP_TYPE_XPM_DATA;
};
- 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);
};
IMPLEMENT_DYNAMIC_CLASS(wxXPMDataHandler, wxBitmapHandler)
-bool wxXPMDataHandler::Create(wxBitmap *bitmap, void *data, const long flags, const int width, const int height, const int depth)
+bool wxXPMDataHandler::Create(wxBitmap *bitmap, void *data, long flags, int width, int height, int depth)
{
#if USE_XPM_IN_MSW
XImage *ximage;
#define BUTTON_HEIGHT_FACTOR (EDIT_CONTROL_FACTOR * 1.1)
-bool wxBitmapButton::Create(wxWindow *parent, const wxWindowID id, const wxBitmap& bitmap,
+bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
const wxPoint& pos,
- const wxSize& size, const long style,
+ const wxSize& size, long style,
const wxValidator& validator,
const wxString& name)
{
wxTheBrushList->RemoveBrush(this);
}
-wxBrush::wxBrush(const wxColour& col, const int Style)
+wxBrush::wxBrush(const wxColour& col, int Style)
{
m_refData = new wxBrushRefData;
wxTheBrushList->AddBrush(this);
}
-wxBrush::wxBrush(const wxString& col, const int Style)
+wxBrush::wxBrush(const wxString& col, int Style)
{
m_refData = new wxBrushRefData;
RealizeResource();
}
-void wxBrush::SetStyle(const int Style)
+void wxBrush::SetStyle(int Style)
{
if ( !M_BRUSHDATA )
m_refData = new wxBrushRefData;
// Buttons
-bool wxButton::MSWCommand(const WXUINT param, const WXWORD id)
+bool wxButton::MSWCommand(WXUINT param, WXWORD id)
{
if (param == BN_CLICKED)
{
else return FALSE;
}
-bool wxButton::Create(wxWindow *parent, const wxWindowID id, const wxString& label,
+bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
const wxPoint& pos,
- const wxSize& size, const long style,
+ const wxSize& size, long style,
const wxValidator& validator,
const wxString& name)
{
return TRUE;
}
-void wxButton::SetSize(const int x, const int y, const int width, const int height, const int sizeFlags)
+void wxButton::SetSize(int x, int y, int width, int height, int sizeFlags)
{
int currentX, currentY;
GetPosition(¤tX, ¤tY);
int ww, hh;
GetSize(&ww, &hh);
- float current_width;
- float cyf;
+ int current_width;
+ int cyf;
char buf[300];
GetWindowText((HWND) GetHWND(), buf, 300);
GetTextExtent(buf, ¤t_width, &cyf,NULL,NULL,GetFont());
}
MoveWindow((HWND) GetHWND(), x1, y1, actualWidth, actualHeight, TRUE);
-
-/*
- if (!((width == -1) && (height == -1)))
- {
-#if WXWIN_COMPATIBILITY
- GetEventHandler()->OldOnSize(width, height);
-#else
- wxSizeEvent event(wxSize(width, height), m_windowId);
- event.eventObject = this;
- GetEventHandler()->ProcessEvent(event);
-#endif
- }
-*/
}
void wxButton::SetDefault(void)
SetWindowText((HWND) GetHWND(), (const char *) label);
}
-WXHBRUSH wxButton::OnCtlColor(const WXHDC pDC, const WXHWND pWnd, const WXUINT nCtlColor,
+WXHBRUSH wxButton::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
{
/*
IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox)
#endif
-bool wxCheckBox::MSWCommand(const WXUINT WXUNUSED(param), const WXWORD WXUNUSED(id))
+bool wxCheckBox::MSWCommand(WXUINT WXUNUSED(param), WXWORD WXUNUSED(id))
{
wxCommandEvent event(wxEVENT_TYPE_CHECKBOX_COMMAND, m_windowId);
event.SetInt(GetValue());
}
// Single check box item
-bool wxCheckBox::Create(wxWindow *parent, const wxWindowID id, const wxString& label,
+bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
const wxPoint& pos,
- const wxSize& size, const long style,
+ const wxSize& size, long style,
const wxValidator& validator,
const wxString& name)
{
SetWindowText((HWND) GetHWND(), (const char *)label);
}
-void wxCheckBox::SetSize(const int x, const int y, const int width, const int height, const int sizeFlags)
+void wxCheckBox::SetSize(int x, int y, int width, int height, int sizeFlags)
{
int currentX, currentY;
GetPosition(¤tX, ¤tY);
char buf[300];
- float current_width;
-
- float cyf;
-
+ int current_width, cyf;
HWND button = (HWND) GetHWND();
GetWindowText(button, buf, 300);
}
MoveWindow(button, x1, y1, w1, h1, TRUE);
-
-/*
-#if WXWIN_COMPATIBILITY
- GetEventHandler()->OldOnSize(width, height);
-#else
- wxSizeEvent event(wxSize(width, height), m_windowId);
- event.eventObject = this;
- GetEventHandler()->ProcessEvent(event);
-#endif
-*/
-
}
-void wxCheckBox::SetValue(const bool val)
+void wxCheckBox::SetValue(bool val)
{
SendMessage((HWND) GetHWND(), BM_SETCHECK, val, 0);
}
#endif
}
-WXHBRUSH wxCheckBox::OnCtlColor(const WXHDC pDC, const WXHWND pWnd, const WXUINT nCtlColor,
+WXHBRUSH wxCheckBox::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
{
#if CTL3D
ProcessCommand (event);
}
-bool wxBitmapCheckBox::Create(wxWindow *parent, const wxWindowID id, const wxBitmap *label,
+bool wxBitmapCheckBox::Create(wxWindow *parent, wxWindowID id, const wxBitmap *label,
const wxPoint& pos,
- const wxSize& size, const long style,
+ const wxSize& size, long style,
const wxValidator& validator,
const wxString& name)
{
{
}
-void wxBitmapCheckBox::SetSize(const int x, const int y, const int width, const int height, const int sizeFlags)
+void wxBitmapCheckBox::SetSize(int x, int y, int width, int height, int sizeFlags)
{
int currentX, currentY;
GetPosition(¤tX, ¤tY);
h1 = checkHeight + FB_MARGIN ;
*/
MoveWindow(button, x1, y1, w1, h1, TRUE);
-
-#if WXWIN_COMPATIBILITY
- GetEventHandler()->OldOnSize(width, height);
-#else
- wxSizeEvent event(wxSize(width, height), m_windowId);
- event.eventObject = this;
- GetEventHandler()->ProcessEvent(event);
-#endif
}
-void wxBitmapCheckBox::SetValue(const bool val)
+void wxBitmapCheckBox::SetValue(bool val)
{
SendMessage((HWND) GetHWND(), BM_SETCHECK, val, 0);
}
}
// ctor which creates the associated control
-wxCheckListBox::wxCheckListBox(wxWindow *parent, const wxWindowID id,
+wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id,
const wxPoint& pos, const wxSize& size,
- const int nStrings, const wxString choices[],
- const long style, const wxValidator& val,
+ int nStrings, const wxString choices[],
+ long style, const wxValidator& val,
const wxString& name) // , const wxFont& font)
// don't use ctor with arguments! we must call Create()
// ourselves from here.
IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
#endif
-bool wxChoice::MSWCommand(const WXUINT param, const WXWORD WXUNUSED(id))
+bool wxChoice::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
{
if (param == CBN_SELCHANGE)
{
else return FALSE;
}
-bool wxChoice::Create(wxWindow *parent, const wxWindowID id,
+bool wxChoice::Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos,
const wxSize& size,
- const int n, const wxString choices[],
- const long style,
+ int n, const wxString choices[],
+ long style,
const wxValidator& validator,
const wxString& name)
{
no_strings ++;
}
-void wxChoice::Delete(const int n)
+void wxChoice::Delete(int n)
{
no_strings = (int)SendMessage((HWND) GetHWND(), CB_DELETESTRING, n, 0);
}
return (int)SendMessage((HWND) GetHWND(), CB_GETCURSEL, 0, 0);
}
-void wxChoice::SetSelection(const int n)
+void wxChoice::SetSelection(int n)
{
SendMessage((HWND) GetHWND(), CB_SETCURSEL, n, 0);
}
#endif
}
-wxString wxChoice::GetString(const int n) const
+wxString wxChoice::GetString(int n) const
{
int len = (int)SendMessage((HWND) GetHWND(), CB_GETLBTEXT, n, (long)wxBuffer);
wxBuffer[len] = 0;
return wxString(wxBuffer);
}
-void wxChoice::SetSize(const int x, const int y, const int width, const int height, const int sizeFlags)
+void wxChoice::SetSize(int x, int y, int width, int height, int sizeFlags)
{
int currentX, currentY;
GetPosition(¤tX, ¤tY);
control_width = (float)100.0;
else
{
- float len, ht;
+ int len, ht;
float longest = (float)0.0;
int i;
for (i = 0; i < no_strings; i++)
MoveWindow((HWND) GetHWND(), x1, y1,
(int)control_width, (int)control_height, TRUE);
-
-/*
-#if WXWIN_COMPATIBILITY
- GetEventHandler()->OldOnSize(width, height);
-#else
- wxSizeEvent event(wxSize(width, height), m_windowId);
- event.eventObject = this;
- GetEventHandler()->ProcessEvent(event);
-#endif
-*/
}
-WXHBRUSH wxChoice::OnCtlColor(const WXHDC pDC, const WXHWND pWnd, const WXUINT nCtlColor,
+WXHBRUSH wxChoice::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
{
return 0;
IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
#endif
-bool wxComboBox::MSWCommand(const WXUINT param, const WXWORD WXUNUSED(id))
+bool wxComboBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
{
if (param == CBN_SELCHANGE)
{
else return FALSE;
}
-bool wxComboBox::Create(wxWindow *parent, const wxWindowID id,
+bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
const wxString& value,
const wxPoint& pos,
const wxSize& size,
- const int n, const wxString choices[],
- const long style,
+ int n, const wxString choices[],
+ long style,
const wxValidator& validator,
const wxString& name)
{
SendMessage(hWnd, WM_PASTE, 0, 0L);
}
-void wxComboBox::SetEditable(const bool editable)
+void wxComboBox::SetEditable(bool editable)
{
// Can't implement in MSW?
// HWND hWnd = (HWND) GetHWND();
// SendMessage(hWnd, EM_SETREADONLY, (WPARAM)!editable, (LPARAM)0L);
}
-void wxComboBox::SetInsertionPoint(const long pos)
+void wxComboBox::SetInsertionPoint(long pos)
{
/*
HWND hWnd = (HWND) GetHWND();
return 0;
}
-void wxComboBox::Replace(const long from, const long to, const wxString& value)
+void wxComboBox::Replace(long from, long to, const wxString& value)
{
#if USE_CLIPBOARD
HWND hWnd = (HWND) GetHWND();
#endif
}
-void wxComboBox::Remove(const long from, const long to)
+void wxComboBox::Remove(long from, long to)
{
HWND hWnd = (HWND) GetHWND();
long fromChar = from;
SendMessage(hWnd, WM_CUT, (WPARAM)0, (LPARAM)0);
}
-void wxComboBox::SetSelection(const long from, const long to)
+void wxComboBox::SetSelection(long from, long to)
{
HWND hWnd = (HWND) GetHWND();
long fromChar = from;
}
*/
-void wxControl::MSWOnMouseMove(const int x, const int y, const WXUINT flags)
+void wxControl::MSWOnMouseMove(int x, int y, WXUINT flags)
{
/*
// Trouble with this is that it sets the cursor for controls too :-(
m_lastEvent = wxEVT_MOTION;
m_lastXPos = event.GetX(); m_lastYPos = event.GetY();
- GetEventHandler()->OldOnMouseEvent(event);
+
+ if (!GetEventHandler()->ProcessEvent(event))
+ Default();
}
long wxControl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
return wxWindow::MSWWindowProc(nMsg, wParam, lParam);
}
-bool wxControl::MSWNotify(const WXWPARAM wParam, const WXLPARAM lParam)
+bool wxControl::MSWNotify(WXWPARAM wParam, WXLPARAM lParam)
{
#if defined(__WIN95__)
wxCommandEvent event(wxEVT_NULL, m_windowId);
::SetMapMode((HDC) event.GetDC()->GetHDC(), mode);
}
-void wxControl::SetClientSize (const int width, const int height)
+void wxControl::SetClientSize (int width, int height)
{
SetSize (-1, -1, width, height);
}
-void wxControl::Centre (const int direction)
+void wxControl::Centre (int direction)
{
int x, y, width, height, panel_width, panel_height, new_x, new_y;
{
}
-wxCursor::wxCursor(const char WXUNUSED(bits)[], const int WXUNUSED(width), const int WXUNUSED(height),
- const int WXUNUSED(hotSpotX), const int WXUNUSED(hotSpotY), const char WXUNUSED(maskBits)[])
+wxCursor::wxCursor(const char WXUNUSED(bits)[], int WXUNUSED(width), int WXUNUSED(height),
+ int WXUNUSED(hotSpotX), int WXUNUSED(hotSpotY), const char WXUNUSED(maskBits)[])
{
}
-wxCursor::wxCursor(const wxString& cursor_file, const long flags, const int hotSpotX, const int hotSpotY)
+wxCursor::wxCursor(const wxString& cursor_file, long flags, int hotSpotX, int hotSpotY)
{
m_refData = new wxIconRefData;
}
// Cursors by stock number
-wxCursor::wxCursor(const int cursor_type)
+wxCursor::wxCursor(int cursor_type)
{
m_refData = new wxIconRefData;
IMPLEMENT_CLASS(wxPrinterDC, wxDC)
#endif
-wxPrinterDC::wxPrinterDC(const wxString& driver_name, const wxString& device_name, const wxString& file, const bool interactive, const int orientation)
+wxPrinterDC::wxPrinterDC(const wxString& driver_name, const wxString& device_name, const wxString& file, bool interactive, int orientation)
{
m_isInteractive = interactive;
SetDefaultBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
}
-bool wxDialog::Create(wxWindow *parent, const wxWindowID id,
+bool wxDialog::Create(wxWindow *parent, wxWindowID id,
const wxString& title,
const wxPoint& pos,
const wxSize& size,
- const long style,
+ long style,
const wxString& name)
{
SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
return TRUE;
}
-void wxDialog::SetModal(const bool flag)
+void wxDialog::SetModal(bool flag)
{
if ( flag )
m_windowStyle |= wxDIALOG_MODAL ;
wxWindow::Fit();
}
-void wxDialog::Iconize(const bool WXUNUSED(iconize))
+void wxDialog::Iconize(bool WXUNUSED(iconize))
{
// Windows dialog boxes can't be iconized
}
return FALSE;
}
-void wxDialog::SetSize(const int x, const int y, const int width, const int height, const int WXUNUSED(sizeFlags))
+void wxDialog::SetSize(int x, int y, int width, int height, int WXUNUSED(sizeFlags))
{
wxWindow::SetSize(x, y, width, height);
}
-void wxDialog::SetClientSize(const int width, const int height)
+void wxDialog::SetClientSize(int width, int height)
{
HWND hWnd = (HWND) GetHWND();
RECT rect;
int actual_height = rect2.bottom - rect2.top - rect.bottom + height;
MoveWindow(hWnd, rect2.left, rect2.top, actual_width, actual_height, TRUE);
-#if WXWIN_COMPATIBILITY
- GetEventHandler()->OldOnSize(actual_width, actual_height);
-#else
+
wxSizeEvent event(wxSize(actual_width, actual_height), m_windowId);
- event.eventObject = this;
+ event.SetEventObject( this );
GetEventHandler()->ProcessEvent(event);
-#endif
}
void wxDialog::GetPosition(int *x, int *y) const
return m_isShown;
}
-bool wxDialog::Show(const bool show)
+bool wxDialog::Show(bool show)
{
m_isShown = show;
return wxString(wxBuffer);
}
-void wxDialog::Centre(const int direction)
+void wxDialog::Centre(int direction)
{
int x_offset,y_offset ;
int display_width, display_height;
}
// Define for each class of dialog and control
-WXHBRUSH wxDialog::OnCtlColor(const WXHDC pDC, const WXHWND pWnd, const WXUINT nCtlColor,
+WXHBRUSH wxDialog::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
{
#if CTL3D
const char *defaultFileName,
int* defaultFilterIndex,
const char *filter,
- const int flags,
+ int flags,
wxWindow* parent,
- const int x,
- const int y)
+ int x,
+ int y)
{
wxFileDialog fileDialog(parent, title ? title : "", defaultDir ? defaultDir : "",
return (M_FONTDATA && (M_FONTDATA->m_hFont == 0));
}
-void wxFont::SetPointSize(const int pointSize)
+void wxFont::SetPointSize(int pointSize)
{
if ( !m_refData )
m_refData = new wxFontRefData;
M_FONTDATA->m_pointSize = pointSize;
}
-void wxFont::SetFamily(const int family)
+void wxFont::SetFamily(int family)
{
if ( !m_refData )
m_refData = new wxFontRefData;
M_FONTDATA->m_family = family;
}
-void wxFont::SetStyle(const int style)
+void wxFont::SetStyle(int style)
{
if ( !m_refData )
m_refData = new wxFontRefData;
M_FONTDATA->m_style = style;
}
-void wxFont::SetWeight(const int weight)
+void wxFont::SetWeight(int weight)
{
if ( !m_refData )
m_refData = new wxFontRefData;
M_FONTDATA->m_faceName = faceName;
}
-void wxFont::SetUnderlined(const bool underlined)
+void wxFont::SetUnderlined(bool underlined)
{
if ( !m_refData )
m_refData = new wxFontRefData;
}
bool wxFrame::Create(wxWindow *parent,
- const wxWindowID id,
+ wxWindowID id,
const wxString& title,
const wxPoint& pos,
const wxSize& size,
- const long style,
+ long style,
const wxString& name)
{
if (!parent)
// Set the client size (i.e. leave the calculation of borders etc.
// to wxWindows)
-void wxFrame::SetClientSize(const int width, const int height)
+void wxFrame::SetClientSize(int width, int height)
{
HWND hWnd = (HWND) GetHWND();
point.y = rect2.top;
MoveWindow(hWnd, point.x, point.y, actual_width, actual_height, (BOOL)TRUE);
-#if WXWIN_COMPATIBILITY
- GetEventHandler()->OldOnSize(width, height);
-#else
+
wxSizeEvent event(wxSize(width, height), m_windowId);
event.SetEventObject( this );
GetEventHandler()->ProcessEvent(event);
-#endif
}
void wxFrame::GetSize(int *width, int *height) const
*y = point.y;
}
-void wxFrame::SetSize(const int x, const int y, const int width, const int height, const int sizeFlags)
+void wxFrame::SetSize(int x, int y, int width, int height, int sizeFlags)
{
int currentX, currentY;
int x1 = x;
MoveWindow((HWND) GetHWND(), x1, y1, w1, h1, (BOOL)TRUE);
-#if WXWIN_COMPATIBILITY
- GetEventHandler()->OldOnSize(width, height);
-#else
wxSizeEvent event(wxSize(width, height), m_windowId);
event.SetEventObject( this );
GetEventHandler()->ProcessEvent(event);
-#endif
}
-bool wxFrame::Show(const bool show)
+bool wxFrame::Show(bool show)
{
int cshow;
if (show)
{
BringWindowToTop((HWND) GetHWND());
-#if WXWIN_COMPATIBILITY
- OldOnActivate(TRUE);
-#else
wxActivateEvent event(wxEVT_ACTIVATE, TRUE, m_windowId);
event.SetEventObject( this );
GetEventHandler()->ProcessEvent(event);
-#endif
}
return TRUE;
}
-void wxFrame::Iconize(const bool iconize)
+void wxFrame::Iconize(bool iconize)
{
if (!iconize)
Show(TRUE);
}
// Equivalent to maximize/restore in Windows
-void wxFrame::Maximize(const bool maximize)
+void wxFrame::Maximize(bool maximize)
{
Show(TRUE);
int cshow;
#endif
}
-wxStatusBar *wxFrame::OnCreateStatusBar(const int number)
+wxStatusBar *wxFrame::OnCreateStatusBar(int number)
{
wxStatusBar *statusBar = NULL;
return statusBar;
}
-bool wxFrame::CreateStatusBar(const int number)
+bool wxFrame::CreateStatusBar(int number)
{
// VZ: calling CreateStatusBar twice is an error - why anyone would do it?
wxCHECK_MSG( m_frameStatusBar == NULL, FALSE,
return FALSE;
}
-void wxFrame::SetStatusText(const wxString& text, const int number)
+void wxFrame::SetStatusText(const wxString& text, int number)
{
wxCHECK_RET( m_frameStatusBar != NULL, "no statusbar to set text for" );
m_frameStatusBar->SetStatusText(text, number);
}
-void wxFrame::SetStatusWidths(const int n, const int *widths_field)
+void wxFrame::SetStatusWidths(int n, int *widths_field)
{
wxCHECK_RET( m_frameStatusBar != NULL, "no statusbar to set widths for" );
*
*/
-void wxFrame::MSWCreate(const int id, wxWindow *parent, const char *wclass, wxWindow *wx_win, const char *title,
- const int x, const int y, const int width, const int height, const long style)
+void wxFrame::MSWCreate(int id, wxWindow *parent, const char *wclass, wxWindow *wx_win, const char *title,
+ int x, int y, int width, int height, long style)
{
m_defaultIcon = (WXHICON) (wxSTD_FRAME_ICON ? wxSTD_FRAME_ICON : wxDEFAULT_FRAME_ICON);
}
else
{
- GetEventHandler()->OldOnPaint();
+ wxPaintEvent event(m_windowId);
+ event.m_eventObject = this;
+ if (!GetEventHandler()->ProcessEvent(event))
+ Default();
}
return 0;
}
return m_defaultIcon;
}
-void wxFrame::MSWOnSize(const int x, const int y, const WXUINT id)
+void wxFrame::MSWOnSize(int x, int y, WXUINT id)
{
#if DEBUG > 1
wxDebugMsg("wxFrameWnd::OnSize %d\n", m_hWnd);
#endif
PositionStatusBar();
-#if WXWIN_COMPATIBILITY
- GetEventHandler()->OldOnSize(x, y);
-#else
wxSizeEvent event(wxSize(x, y), m_windowId);
event.SetEventObject( this );
- GetEventHandler()->ProcessEvent(event);
-#endif
+ if (!GetEventHandler()->ProcessEvent(event))
+ Default();
}
}
return Close();
}
-bool wxFrame::MSWOnCommand(const WXWORD id, const WXWORD cmd, const WXHWND control)
+bool wxFrame::MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND control)
{
#if DEBUG > 1
wxDebugMsg("wxFrameWnd::OnCommand %d\n", handle);
return FALSE;
}
-void wxFrame::MSWOnMenuHighlight(const WXWORD nItem, const WXWORD nFlags, const WXHMENU hSysMenu)
+void wxFrame::MSWOnMenuHighlight(WXWORD nItem, WXWORD nFlags, WXHMENU hSysMenu)
{
-#if WXWIN_COMPATIBILITY
- if (nFlags == 0xFFFF && hSysMenu == 0)
- GetEventHandler()->OldOnMenuSelect(-1);
- else if (nFlags != MF_SEPARATOR)
- GetEventHandler()->OldOnMenuSelect(nItem);
-#else
if (nFlags == 0xFFFF && hSysMenu == 0)
{
wxMenuEvent event(wxEVT_MENU_HIGHLIGHT, -1);
event.SetEventObject( this );
GetEventHandler()->ProcessEvent(event);
}
-#endif
}
bool wxFrame::MSWProcessMessage(WXMSG* pMsg)
}
}
+#if 0
#if WXWIN_COMPATIBILITY
void wxFrame::OldOnSize(int x, int y)
{
}
#endif
+#endif
+ // 0
+
wxMenuBar *wxFrame::GetMenuBar(void) const
{
return m_frameMenuBar;
}
-void wxFrame::Centre(const int direction)
+void wxFrame::Centre(int direction)
{
int display_width, display_height, width, height, x, y;
wxDisplaySize(&display_width, &display_height);
if (!bar)
return;
- // Motif does the job by itself!!
-#ifndef __MOTIF__
wxMenuItem *item = bar->FindItemForId(id) ;
if (item && item->IsCheckable())
{
-//wxDebugMsg("Toggling id %d\n",id) ;
bar->Check(id,!bar->Checked(id)) ;
}
-#endif
- if (!ProcessEvent(commandEvent))
- OldOnMenuCommand(id);
+ GetEventHandler()->ProcessEvent(commandEvent);
}
void wxFrame::OnIdle(wxIdleEvent& event)
IMPLEMENT_DYNAMIC_CLASS(wxGauge95, wxControl)
#endif
-bool wxGauge95::Create(wxWindow *parent, const wxWindowID id,
- const int range,
+bool wxGauge95::Create(wxWindow *parent, wxWindowID id,
+ int range,
const wxPoint& pos,
const wxSize& size,
- const long style,
+ long style,
const wxValidator& validator,
const wxString& name)
{
return TRUE;
}
-void wxGauge95::SetSize(const int x, const int y, const int width, const int height, const int sizeFlags)
+void wxGauge95::SetSize(int x, int y, int width, int height, int sizeFlags)
{
int currentX, currentY;
GetPosition(¤tX, ¤tY);
h1 = DEFAULT_ITEM_HEIGHT;
MoveWindow((HWND) GetHWND(), x1, y1, w1, h1, TRUE);
-
-#if WXWIN_COMPATIBILITY
- GetEventHandler()->OldOnSize(width, height);
-#else
- wxSizeEvent event(wxSize(width, height), m_windowId);
- event.eventObject = this;
- GetEventHandler()->ProcessEvent(event);
-#endif
}
-void wxGauge95::SetShadowWidth(const int w)
+void wxGauge95::SetShadowWidth(int w)
{
}
-void wxGauge95::SetBezelFace(const int w)
+void wxGauge95::SetBezelFace(int w)
{
}
-void wxGauge95::SetRange(const int r)
+void wxGauge95::SetRange(int r)
{
m_rangeMax = r;
SendMessage((HWND) GetHWND(), PBM_SETRANGE, 0, MAKELPARAM(0, r));
}
-void wxGauge95::SetValue(const int pos)
+void wxGauge95::SetValue(int pos)
{
m_gaugePos = pos;
IMPLEMENT_DYNAMIC_CLASS(wxGaugeMSW, wxControl)
#endif
-bool wxGaugeMSW::Create(wxWindow *parent, const wxWindowID id,
- const int range,
+bool wxGaugeMSW::Create(wxWindow *parent, wxWindowID id,
+ int range,
const wxPoint& pos,
const wxSize& size,
- const long style,
+ long style,
const wxValidator& validator,
const wxString& name)
{
return TRUE;
}
-void wxGaugeMSW::SetSize(const int x, const int y, const int width, const int height, const int sizeFlags)
+void wxGaugeMSW::SetSize(int x, int y, int width, int height, int sizeFlags)
{
int currentX, currentY;
GetPosition(¤tX, ¤tY);
h1 = DEFAULT_ITEM_HEIGHT;
MoveWindow((HWND) GetHWND(), x1, y1, w1, h1, TRUE);
-
-#if WXWIN_COMPATIBILITY
- GetEventHandler()->OldOnSize(width, height);
-#else
- wxSizeEvent event(wxSize(width, height), m_windowId);
- event.eventObject = this;
- GetEventHandler()->ProcessEvent(event);
-#endif
}
-void wxGaugeMSW::SetShadowWidth(const int w)
+void wxGaugeMSW::SetShadowWidth(int w)
{
SendMessage((HWND) GetHWND(), ZYZG_SETWIDTH3D, w, 0);
}
-void wxGaugeMSW::SetBezelFace(const int w)
+void wxGaugeMSW::SetBezelFace(int w)
{
SendMessage((HWND) GetHWND(), ZYZG_SETBEZELFACE, w, 0);
}
-void wxGaugeMSW::SetRange(const int r)
+void wxGaugeMSW::SetRange(int r)
{
m_rangeMax = r;
SendMessage((HWND) GetHWND(), ZYZG_SETRANGE, r, 0);
}
-void wxGaugeMSW::SetValue(const int pos)
+void wxGaugeMSW::SetValue(int pos)
{
m_gaugePos = pos;
{
}
-wxIcon::wxIcon(const char WXUNUSED(bits)[], const int WXUNUSED(width), const int WXUNUSED(height))
+wxIcon::wxIcon(const char WXUNUSED(bits)[], int WXUNUSED(width), int WXUNUSED(height))
{
}
-wxIcon::wxIcon(const wxString& icon_file, const long flags,
+wxIcon::wxIcon(const wxString& icon_file, long flags,
int desiredWidth, int desiredHeight)
{
return TRUE;
}
-bool wxIcon::LoadFile(const wxString& filename, const long type,
+bool wxIcon::LoadFile(const wxString& filename, long type,
int desiredWidth, int desiredHeight)
{
UnRef();
M_ICONDATA->m_hIcon = ico;
}
-bool wxICOFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, const long flags,
+bool wxICOFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
int desiredWidth, int desiredHeight)
{
#if USE_RESOURCE_LOADING_IN_MSW
#endif
}
-bool wxICOResourceHandler::LoadFile(wxBitmap *bitmap, const wxString& name, const long flags,
+bool wxICOResourceHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
int desiredWidth, int desiredHeight)
{
if ( bitmap->IsKindOf(CLASSINFO(wxIcon)) )
////////////////////////////////////////////////////////////////////////////
// Creates an image list
-bool wxImageList::Create(const int width, const int height, const bool mask, const int initial)
+bool wxImageList::Create(int width, int height, bool mask, int initial)
{
UINT flags = 0;
if ( mask )
// Replaces a bitmap, optionally passing a mask bitmap.
// Note that wxImageList creates new bitmaps, so you may delete
// 'bitmap' and 'mask'.
-bool wxImageList::Replace(const int index, const wxBitmap& bitmap, const wxBitmap& mask)
+bool wxImageList::Replace(int index, const wxBitmap& bitmap, const wxBitmap& mask)
{
HBITMAP hBitmap1 = (HBITMAP) bitmap.GetHBITMAP();
HBITMAP hBitmap2 = 0;
// Replacing a bitmap, using the specified colour to create the mask bitmap
// Note that wxImageList creates new bitmaps, so you may delete
// 'bitmap'.
-bool wxImageList::Replace(const int index, const wxBitmap& bitmap, const wxColour& maskColour)
+bool wxImageList::Replace(int index, const wxBitmap& bitmap, const wxColour& maskColour)
{
HBITMAP hBitmap1 = (HBITMAP) bitmap.GetHBITMAP();
COLORREF colorRef = PALETTERGB(maskColour.Red(), maskColour.Green(), maskColour.Blue());
*/
// Replaces a bitmap and mask from an icon.
-bool wxImageList::Replace(const int index, const wxIcon& icon)
+bool wxImageList::Replace(int index, const wxIcon& icon)
{
HICON hIcon = (HICON) icon.GetHICON();
return (ImageList_ReplaceIcon((HIMAGELIST) GetHIMAGELIST(), index, hIcon) != 0);
}
// Removes the image at the given index.
-bool wxImageList::Remove(const int index)
+bool wxImageList::Remove(int index)
{
return (ImageList_Remove((HIMAGELIST) GetHIMAGELIST(), index) != 0);
}
// If 'solidBackground' is TRUE, Draw sets the image list background
// colour to the background colour of the wxDC, to speed up
// drawing by eliminating masked drawing where possible.
-bool wxImageList::Draw(const int index, wxDC& dc, const int x, const int y,
- const int flags, const bool solidBackground)
+bool wxImageList::Draw(int index, wxDC& dc, int x, int y,
+ int flags, bool solidBackground)
{
HDC hDC = (HDC) dc.GetHDC();
if ( !hDC )
// this macro is dangerous but still better than tons of (HWND)GetHWND()
#define hwnd (HWND)GetHWND()
-bool wxListBox::MSWCommand(const WXUINT param, const WXWORD WXUNUSED(id))
+bool wxListBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
{
/*
if (param == LBN_SELCANCEL)
{
wxCommandEvent event(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, m_windowId);
event.SetEventObject( this );
- if ( !GetEventHandler()->ProcessEvent(event) )
+ GetEventHandler()->ProcessEvent(event) ;
+ return TRUE;
+/*
{
#if WXWIN_COMPATIBILITY
wxWindow *parent = (wxWindow *)GetParent();
#endif
return TRUE;
}
+ */
}
return FALSE;
}
m_selected = 0;
}
-bool wxListBox::Create(wxWindow *parent, const wxWindowID id,
+bool wxListBox::Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos,
const wxSize& size,
- const int n, const wxString choices[],
- const long style,
+ int n, const wxString choices[],
+ long style,
const wxValidator& validator,
const wxString& name)
{
SetForegroundColour(GetParent()->GetDefaultForegroundColour());
}
-void wxListBox::SetFirstItem(const int N)
+void wxListBox::SetFirstItem(int N)
{
SendMessage(hwnd,LB_SETTOPINDEX,(WPARAM)N,(LPARAM)0) ;
}
SetFirstItem(N) ;
}
-void wxListBox::Delete(const int N)
+void wxListBox::Delete(int N)
{
SendMessage(hwnd, LB_DELETESTRING, N, 0);
m_noItems --;
SetHorizontalExtent(item);
}
-void wxListBox::Set(const int n, const wxString *choices, char** clientData)
+void wxListBox::Set(int n, const wxString *choices, char** clientData)
{
ShowWindow(hwnd, SW_HIDE);
ListBox_ResetContent(hwnd);
ListBox_GetHorizontalExtent(hwnd);
}
-void wxListBox::SetSelection(const int N, const bool select)
+void wxListBox::SetSelection(int N, bool select)
{
if ((m_windowStyle & wxLB_MULTIPLE) || (m_windowStyle & wxLB_EXTENDED))
SendMessage(hwnd, LB_SETSEL, select, N);
}
}
-bool wxListBox::Selected(const int N) const
+bool wxListBox::Selected(int N) const
{
return SendMessage(hwnd, LB_GETSEL, N, 0) == 0 ? FALSE : TRUE;
}
-void wxListBox::Deselect(const int N)
+void wxListBox::Deselect(int N)
{
if ((m_windowStyle & wxLB_MULTIPLE) || (m_windowStyle & wxLB_EXTENDED))
SendMessage(hwnd, LB_SETSEL, FALSE, N);
}
-char *wxListBox::GetClientData(const int N) const
+char *wxListBox::GetClientData(int N) const
{
return (char *)SendMessage(hwnd, LB_GETITEMDATA, N, 0);
}
-void wxListBox::SetClientData(const int N, char *Client_data)
+void wxListBox::SetClientData(int N, char *Client_data)
{
if ( ListBox_SetItemData(hwnd, N, Client_data) == LB_ERR )
wxLogDebug("LB_SETITEMDATA failed");
}
// Find string for position
-wxString wxListBox::GetString(const int N) const
+wxString wxListBox::GetString(int N) const
{
if (N < 0 || N > m_noItems)
return wxString("");
return wxString(wxBuffer);
}
-void wxListBox::SetSize(const int x, const int y, const int width, const int height, const int sizeFlags)
+void wxListBox::SetSize(int x, int y, int width, int height, int sizeFlags)
{
int currentX, currentY;
GetPosition(¤tX, ¤tY);
MoveWindow(hwnd, (int)control_x, (int)control_y,
(int)control_width, (int)control_height, TRUE);
-/*
-#if WXWIN_COMPATIBILITY
- GetEventHandler()->OldOnSize(width, height);
-#else
- wxSizeEvent event(wxSize(width, height), m_windowId);
- event.eventObject = this;
- GetEventHandler()->ProcessEvent(event);
-#endif
-*/
-
}
// Windows-specific code to set the horizontal extent of
}
void
-wxListBox::InsertItems(const int nItems, const wxString items[], const int pos)
+wxListBox::InsertItems(int nItems, const wxString items[], int pos)
{
int i;
for (i = 0; i < nItems; i++)
SetHorizontalExtent("");
}
-void wxListBox::SetString(const int N, const wxString& s)
+void wxListBox::SetString(int N, const wxString& s)
{
int sel = GetSelection();
return wxString("");
}
-bool wxListBox::SetStringSelection (const wxString& s, const bool flag)
+bool wxListBox::SetStringSelection (const wxString& s, bool flag)
{
int sel = FindString (s);
if (sel > -1)
ProcessCommand (event);
}
-WXHBRUSH wxListBox::OnCtlColor(const WXHDC pDC, const WXHWND pWnd, const WXUINT nCtlColor,
+WXHBRUSH wxListBox::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
{
#if CTL3D
case WM_LBUTTONUP:
case WM_LBUTTONDBLCLK:
case WM_MOUSEMOVE:
- case WM_DESTROY:
case WM_COMMAND:
case WM_NOTIFY:
+ case WM_DESTROY:
case WM_MENUSELECT:
case WM_INITMENUPOPUP:
case WM_DRAWITEM:
return MSWDefWindowProc(nMsg, wParam, lParam );
}
#endif
+
return wxControl::MSWWindowProc(nMsg, wParam, lParam);
}
m_colCount = 0;
}
-bool wxListCtrl::Create(wxWindow *parent, const wxWindowID id, const wxPoint& pos, const wxSize& size,
- const long style, const wxValidator& validator, const wxString& name)
+bool wxListCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
+ long style, const wxValidator& validator, const wxString& name)
{
m_imageListNormal = NULL;
m_imageListSmall = NULL;
}
// Add or remove a single window style
-void wxListCtrl::SetSingleStyle(const long style, const bool add)
+void wxListCtrl::SetSingleStyle(long style, bool add)
{
long flag = GetWindowStyleFlag();
}
// Set the whole window style
-void wxListCtrl::SetWindowStyleFlag(const long flag)
+void wxListCtrl::SetWindowStyleFlag(long flag)
{
m_windowStyle = flag;
}
// Can be just a single style, or a bitlist
-long wxListCtrl::ConvertToMSWStyle(long& oldStyle, const long style) const
+long wxListCtrl::ConvertToMSWStyle(long& oldStyle, long style) const
{
long wstyle = 0;
if ( style & wxLC_ICON )
}
// Gets information about this column
-bool wxListCtrl::GetColumn(const int col, wxListItem& item) const
+bool wxListCtrl::GetColumn(int col, wxListItem& item) const
{
LV_COLUMN lvCol;
lvCol.mask = 0;
}
// Sets information about this column
-bool wxListCtrl::SetColumn(const int col, wxListItem& item)
+bool wxListCtrl::SetColumn(int col, wxListItem& item)
{
LV_COLUMN lvCol;
lvCol.mask = 0;
}
// Gets the column width
-int wxListCtrl::GetColumnWidth(const int col) const
+int wxListCtrl::GetColumnWidth(int col) const
{
return ListView_GetColumnWidth((HWND) GetHWND(), col);
}
// Sets the column width
-bool wxListCtrl::SetColumnWidth(const int col, const int width)
+bool wxListCtrl::SetColumnWidth(int col, int width)
{
int col2 = col;
if ( m_windowStyle & wxLC_LIST )
return (ListView_SetItem((HWND) GetHWND(), &item) != 0);
}
-long wxListCtrl::SetItem(const long index, const int col, const wxString& label, const int imageId)
+long wxListCtrl::SetItem(long index, int col, const wxString& label, int imageId)
{
wxListItem info;
info.m_text = label;
// Gets the item state
-int wxListCtrl::GetItemState(const long item, const long stateMask) const
+int wxListCtrl::GetItemState(long item, long stateMask) const
{
wxListItem info;
}
// Sets the item state
-bool wxListCtrl::SetItemState(const long item, const long state, const long stateMask)
+bool wxListCtrl::SetItemState(long item, long state, long stateMask)
{
wxListItem info;
}
// Sets the item image
-bool wxListCtrl::SetItemImage(const long item, const int image, const int selImage)
+bool wxListCtrl::SetItemImage(long item, int image, int selImage)
{
wxListItem info;
}
// Gets the item text
-wxString wxListCtrl::GetItemText(const long item) const
+wxString wxListCtrl::GetItemText(long item) const
{
wxListItem info;
}
// Sets the item text
-void wxListCtrl::SetItemText(const long item, const wxString& str)
+void wxListCtrl::SetItemText(long item, const wxString& str)
{
wxListItem info;
}
// Gets the item data
-long wxListCtrl::GetItemData(const long item) const
+long wxListCtrl::GetItemData(long item) const
{
wxListItem info;
}
// Sets the item data
-bool wxListCtrl::SetItemData(const long item, long data)
+bool wxListCtrl::SetItemData(long item, long data)
{
wxListItem info;
}
// Gets the item rectangle
-bool wxListCtrl::GetItemRect(const long item, wxRectangle& rect, const int code) const
+bool wxListCtrl::GetItemRect(long item, wxRectangle& rect, int code) const
{
RECT rect2;
}
// Gets the item position
-bool wxListCtrl::GetItemPosition(const long item, wxPoint& pos) const
+bool wxListCtrl::GetItemPosition(long item, wxPoint& pos) const
{
POINT pt;
}
// Sets the item position.
-bool wxListCtrl::SetItemPosition(const long item, const wxPoint& pos)
+bool wxListCtrl::SetItemPosition(long item, const wxPoint& pos)
{
return (ListView_SetItemPosition((HWND) GetHWND(), (int) item, pos.x, pos.y) != 0);
}
// item can be -1 to find the first item that matches the
// specified flags.
// Returns the item or -1 if unsuccessful.
-long wxListCtrl::GetNextItem(const long item, int geom, int state) const
+long wxListCtrl::GetNextItem(long item, int geom, int state) const
{
long flags = 0;
}
-wxImageList *wxListCtrl::GetImageList(const int which) const
+wxImageList *wxListCtrl::GetImageList(int which) const
{
if ( which == wxIMAGE_LIST_NORMAL )
{
return NULL;
}
-void wxListCtrl::SetImageList(wxImageList *imageList, const int which)
+void wxListCtrl::SetImageList(wxImageList *imageList, int which)
{
int flags = 0;
if ( which == wxIMAGE_LIST_NORMAL )
////////////////////////////////////////////////////////////////////////////
// Arranges the items
-bool wxListCtrl::Arrange(const int flag)
+bool wxListCtrl::Arrange(int flag)
{
UINT code = 0;
if ( flag == wxLIST_ALIGN_LEFT )
}
// Deletes an item
-bool wxListCtrl::DeleteItem(const long item)
+bool wxListCtrl::DeleteItem(long item)
{
return (ListView_DeleteItem((HWND) GetHWND(), (int) item) != 0);
}
}
// Deletes a column
-bool wxListCtrl::DeleteColumn(const int col)
+bool wxListCtrl::DeleteColumn(int col)
{
bool success = (ListView_DeleteColumn((HWND) GetHWND(), col) != 0);
}
// Edits a label
-wxTextCtrl& wxListCtrl::Edit(const long item)
+wxTextCtrl& wxListCtrl::Edit(long item)
{
HWND hWnd = (HWND) ListView_EditLabel((HWND) GetHWND(), (int) item);
m_textCtrl.SetHWND((WXHWND) hWnd);
}
// Ensures this item is visible
-bool wxListCtrl::EnsureVisible(const long item)
+bool wxListCtrl::EnsureVisible(long item)
{
return (ListView_EnsureVisible((HWND) GetHWND(), (int) item, FALSE) != 0);
}
// Find an item whose label matches this string, starting from the item after 'start'
// or the beginning if 'start' is -1.
-long wxListCtrl::FindItem(const long start, const wxString& str, const bool partial)
+long wxListCtrl::FindItem(long start, const wxString& str, bool partial)
{
LV_FINDINFO findInfo;
// Find an item whose data matches this data, starting from the item after 'start'
// or the beginning if 'start' is -1.
-long wxListCtrl::FindItem(const long start, const long data)
+long wxListCtrl::FindItem(long start, long data)
{
LV_FINDINFO findInfo;
// Find an item nearest this position in the specified direction, starting from
// the item after 'start' or the beginning if 'start' is -1.
-long wxListCtrl::FindItem(const long start, const wxPoint& pt, const int direction)
+long wxListCtrl::FindItem(long start, const wxPoint& pt, int direction)
{
LV_FINDINFO findInfo;
return (long) ListView_InsertItem((HWND) GetHWND(), & item);
}
-long wxListCtrl::InsertItem(const long index, const wxString& label)
+long wxListCtrl::InsertItem(long index, const wxString& label)
{
wxListItem info;
info.m_text = label;
}
// Inserts an image item
-long wxListCtrl::InsertItem(const long index, const int imageIndex)
+long wxListCtrl::InsertItem(long index, int imageIndex)
{
wxListItem info;
info.m_image = imageIndex;
}
// Inserts an image/string item
-long wxListCtrl::InsertItem(const long index, const wxString& label, const int imageIndex)
+long wxListCtrl::InsertItem(long index, const wxString& label, int imageIndex)
{
wxListItem info;
info.m_image = imageIndex;
}
// For list view mode (only), inserts a column.
-long wxListCtrl::InsertColumn(const long col, wxListItem& item)
+long wxListCtrl::InsertColumn(long col, wxListItem& item)
{
LV_COLUMN lvCol;
lvCol.mask = 0;
return success;
}
-long wxListCtrl::InsertColumn(const long col, const wxString& heading, const int format,
- const int width)
+long wxListCtrl::InsertColumn(long col, const wxString& heading, int format,
+ int width)
{
wxListItem item;
item.m_mask = wxLIST_MASK_TEXT | wxLIST_MASK_FORMAT;
// specifies the number of columns to scroll.
// If in icon, small icon or list view mode, y specifies the number of pixels
// to scroll. If in report view mode, y specifies the number of lines to scroll.
-bool wxListCtrl::ScrollList(const int dx, const int dy)
+bool wxListCtrl::ScrollList(int dx, int dy)
{
return (ListView_Scroll((HWND) GetHWND(), dx, dy) != 0);
}
return (ListView_SortItems((HWND) GetHWND(), (PFNLVCOMPARE) fn, data) != 0);
}
-bool wxListCtrl::MSWCommand(const WXUINT cmd, const WXWORD id)
+bool wxListCtrl::MSWCommand(WXUINT cmd, WXWORD id)
{
if (cmd == EN_UPDATE)
{
else return FALSE;
}
-bool wxListCtrl::MSWNotify(const WXWPARAM wParam, const WXLPARAM lParam)
+bool wxListCtrl::MSWNotify(WXWPARAM wParam, WXLPARAM lParam)
{
wxListEvent event(wxEVT_NULL, m_windowId);
wxEventType eventType = wxEVT_NULL;
}
bool wxMDIParentFrame::Create(wxWindow *parent,
- const wxWindowID id,
+ wxWindowID id,
const wxString& title,
const wxPoint& pos,
const wxSize& size,
- const long style,
+ long style,
const wxString& name)
{
m_defaultIcon = (WXHICON) (wxSTD_MDIPARENTFRAME_ICON ? wxSTD_MDIPARENTFRAME_ICON : wxDEFAULT_MDIPARENTFRAME_ICON);
}
#if WXWIN_COMPATIBILITY
+/*
void wxMDIParentFrame::OldOnSize(int x, int y)
{
#if WXWIN_COMPATIBILITY == 1
#else
#endif
}
+*/
#endif
m_clientWindow->CreateClient(this, GetWindowStyleFlag());
}
-void wxMDIParentFrame::MSWOnSize(const int x, const int y, const WXUINT id)
+void wxMDIParentFrame::MSWOnSize(int x, int y, WXUINT id)
{
switch (id)
{
PositionStatusBar();
- GetEventHandler()->OldOnSize(x, y);
+ wxSizeEvent event(wxSize(x, y), m_windowId);
+ event.SetEventObject( this );
+ if (!GetEventHandler()->ProcessEvent(event))
+ Default();
}
}
-bool wxMDIParentFrame::MSWOnActivate(const int state, const bool minimized, const WXHWND activate)
+bool wxMDIParentFrame::MSWOnActivate(int state, bool minimized, WXHWND activate)
{
wxWindow::MSWOnActivate(state, minimized, activate);
// to the current child.
if ((m_currentChild != NULL) && ((state == WA_ACTIVE) || (state == WA_CLICKACTIVE)))
{
-#if WXWIN_COMPATIBILITY
- m_currentChild->GetEventHandler()->OldOnActivate(TRUE);
-#else
- wxActivateEvent event(wxEVT_ACTIVATE, TRUE,
- m_currentChild.m_windowId);
- event.eventObject = m_currentChild;
- m_currentChild->GetEventHandler()->ProcessEvent(event);
-#endif
+ wxActivateEvent event(wxEVT_ACTIVATE, TRUE, m_currentChild->GetId());
+ event.SetEventObject( m_currentChild );
+ m_currentChild->GetEventHandler()->ProcessEvent(event);
}
return 0;
}
-bool wxMDIParentFrame::MSWOnCommand(const WXWORD id, const WXWORD cmd, const WXHWND control)
+bool wxMDIParentFrame::MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND control)
{
if (cmd == 0)
{
return FALSE;
}
-void wxMDIParentFrame::MSWOnMenuHighlight(const WXWORD nItem, const WXWORD nFlags, const WXHMENU hSysMenu)
+void wxMDIParentFrame::MSWOnMenuHighlight(WXWORD nItem, WXWORD nFlags, WXHMENU hSysMenu)
{
if (m_parentFrameActive)
{
- // TODO
if (nFlags == 0xFFFF && hSysMenu == (WXHMENU) NULL)
- GetEventHandler()->OldOnMenuSelect(-1);
+ {
+ wxMenuEvent event(wxEVT_MENU_HIGHLIGHT, -1);
+ event.SetEventObject( this );
+ GetEventHandler()->ProcessEvent(event);
+ }
else if (nFlags != MF_SEPARATOR)
- GetEventHandler()->OldOnMenuSelect(nItem);
+ {
+ wxMenuEvent event(wxEVT_MENU_HIGHLIGHT, nItem);
+ event.SetEventObject( this );
+ GetEventHandler()->ProcessEvent(event);
+ }
}
else if (m_currentChild)
{
return FALSE;
}
-bool wxMDIParentFrame::MSWOnEraseBkgnd(const WXHDC WXUNUSED(pDC))
+bool wxMDIParentFrame::MSWOnEraseBkgnd(WXHDC WXUNUSED(pDC))
{
return TRUE;
}
}
bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
- const wxWindowID id,
+ wxWindowID id,
const wxString& title,
const wxPoint& pos,
const wxSize& size,
- const long style,
+ long style,
const wxString& name)
{
m_defaultIcon = (WXHICON) (wxSTD_MDICHILDFRAME_ICON ? wxSTD_MDICHILDFRAME_ICON : wxDEFAULT_MDICHILDFRAME_ICON);
// Set the client size (i.e. leave the calculation of borders etc.
// to wxWindows)
-void wxMDIChildFrame::SetClientSize(const int width, const int height)
+void wxMDIChildFrame::SetClientSize(int width, int height)
{
HWND hWnd = (HWND) GetHWND();
::ScreenToClient((HWND) mdiParent->GetClientWindow()->GetHWND(), &point);
MoveWindow(hWnd, point.x, point.y, actual_width, actual_height, (BOOL)TRUE);
-#if WXWIN_COMPATIBILITY
- GetEventHandler()->OldOnSize(width, height);
-#else
+
wxSizeEvent event(wxSize(width, height), m_windowId);
- event.eventObject = this;
+ event.SetEventObject( this );
GetEventHandler()->ProcessEvent(event);
-#endif
}
void wxMDIChildFrame::GetPosition(int *x, int *y) const
}
static HWND invalidHandle = 0;
-void wxMDIChildFrame::MSWOnSize(const int x, const int y, const WXUINT id)
+void wxMDIChildFrame::MSWOnSize(int x, int y, WXUINT id)
{
if (!GetHWND()) return;
}
}
-bool wxMDIChildFrame::MSWOnCommand(const WXWORD id, const WXWORD cmd, const WXHWND control)
+bool wxMDIChildFrame::MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND control)
{
#if DEBUG > 1
wxDebugMsg("wxMDIChildFrame::MSWOnCommand %d\n", GetHWND());
return FALSE;
}
-long wxMDIChildFrame::MSWOnMDIActivate(const long activate, const WXHWND WXUNUSED(one), const WXHWND WXUNUSED(two))
+long wxMDIChildFrame::MSWOnMDIActivate(long activate, WXHWND WXUNUSED(one), WXHWND WXUNUSED(two))
{
wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent();
HMENU parent_menu = (HMENU) parent->GetWinMenu();
::DrawMenuBar((HWND) parent->GetHWND());
}
- GetEventHandler()->OldOnActivate(TRUE);
+ wxActivateEvent event(wxEVT_ACTIVATE, TRUE, m_windowId);
+ event.SetEventObject( this );
+ GetEventHandler()->ProcessEvent(event);
}
else
{
if (parent->m_currentChild == this)
parent->m_currentChild = NULL;
- GetEventHandler()->OldOnActivate(FALSE);
+
+ wxActivateEvent event(wxEVT_ACTIVATE, FALSE, m_windowId);
+ event.SetEventObject( this );
+ GetEventHandler()->ProcessEvent(event);
// m_active = FALSE;
if (parent_menu)
::DrawMenuBar((HWND) parent->GetHWND());
}
}
- // TODO
bool flag = (activate != 0);
- GetEventHandler()->OldOnActivate(flag);
+ wxActivateEvent event(wxEVT_ACTIVATE, flag, m_windowId);
+ event.SetEventObject( this );
+ GetEventHandler()->ProcessEvent(event);
+
#if DEBUG > 1
wxDebugMsg("Finished (de)activating\n");
#endif
{
}
-bool wxMDIClientWindow::CreateClient(wxMDIParentFrame *parent, const long style)
+bool wxMDIClientWindow::CreateClient(wxMDIParentFrame *parent, long style)
{
m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE);
}
// Should hand the message to the default proc
-long wxMDIClientWindow::MSWOnMDIActivate(const long bActivate, const WXHWND, const WXHWND)
+long wxMDIClientWindow::MSWOnMDIActivate(long bActivate, WXHWND, WXHWND)
{
return Default();
}
return wxString(tmp) ;
}
-bool wxMenu::MSWCommand(const WXUINT WXUNUSED(param), const WXWORD id)
+bool wxMenu::MSWCommand(WXUINT WXUNUSED(param), WXWORD id)
{
wxCommandEvent event(wxEVENT_TYPE_MENU_COMMAND);
event.SetEventObject( this );
return -1;
}
-wxMenuItem *wxMenu::FindItemForId(const int itemId, wxMenu ** itemMenu) const
+wxMenuItem *wxMenu::FindItemForId(int itemId, wxMenu ** itemMenu) const
{
if (itemMenu)
*itemMenu = NULL;
return NULL;
}
-void wxMenu::SetHelpString(const int itemId, const wxString& helpString)
+void wxMenu::SetHelpString(int itemId, const wxString& helpString)
{
wxMenuItem *item = FindItemForId (itemId);
if (item)
item->SetHelp(helpString);
}
-wxString wxMenu::GetHelpString (const int itemId) const
+wxString wxMenu::GetHelpString (int itemId) const
{
wxMenuItem *item = FindItemForId (itemId);
wxString str("");
}
extern wxMenu *wxCurrentPopupMenu;
-bool wxWindow::PopupMenu(wxMenu *menu, const int x, const int y)
+bool wxWindow::PopupMenu(wxMenu *menu, int x, int y)
{
menu->SetInvokingWindow(this);
m_hMenu = 0;
}
-wxMenuBar::wxMenuBar(const int N, wxMenu *Menus[], const wxString Titles[])
+wxMenuBar::wxMenuBar(int N, wxMenu *Menus[], const wxString Titles[])
{
m_eventHandler = this;
m_menuCount = N;
// Must only be used AFTER menu has been attached to frame,
// otherwise use individual menus to enable/disable items
-void wxMenuBar::Enable(const int Id, const bool Flag)
+void wxMenuBar::Enable(int Id, bool Flag)
{
int ms_flag;
if (Flag)
}
-void wxMenuBar::EnableTop(const int pos, const bool flag)
+void wxMenuBar::EnableTop(int pos, bool flag)
{
int ms_flag;
if (flag)
// Must only be used AFTER menu has been attached to frame,
// otherwise use individual menus
-void wxMenuBar::Check(const int Id, const bool Flag)
+void wxMenuBar::Check(int Id, bool Flag)
{
wxMenu *itemMenu = NULL;
wxMenuItem *item = FindItemForId(Id, &itemMenu) ;
// CheckMenuItem((HMENU)m_hMenu, Id, MF_BYCOMMAND | ms_flag);
}
-bool wxMenuBar::Checked(const int Id) const
+bool wxMenuBar::Checked(int Id) const
{
wxMenu *itemMenu = NULL;
wxMenuItem *item = FindItemForId(Id, &itemMenu) ;
return FALSE ;
}
-bool wxMenuBar::Enabled(const int Id) const
+bool wxMenuBar::Enabled(int Id) const
{
wxMenu *itemMenu = NULL;
wxMenuItem *item = FindItemForId(Id, &itemMenu) ;
}
-void wxMenuBar::SetLabel(const int Id, const wxString& label)
+void wxMenuBar::SetLabel(int Id, const wxString& label)
{
wxMenu *itemMenu = NULL;
wxMenuItem *item = FindItemForId(Id, &itemMenu) ;
}
}
-wxString wxMenuBar::GetLabel(const int Id) const
+wxString wxMenuBar::GetLabel(int Id) const
{
wxMenu *itemMenu = NULL;
wxMenuItem *item = FindItemForId(Id, &itemMenu) ;
return wxString(tmp) ;
}
-void wxMenuBar::SetLabelTop(const int pos, const wxString& label)
+void wxMenuBar::SetLabelTop(int pos, const wxString& label)
{
UINT was_flag = GetMenuState((HMENU)m_hMenu,pos,MF_BYPOSITION) ;
if (was_flag&MF_POPUP)
ModifyMenu((HMENU)m_hMenu,pos,MF_BYPOSITION|MF_STRING|was_flag,pos,(const char *)label) ;
}
-wxString wxMenuBar::GetLabelTop(const int pos) const
+wxString wxMenuBar::GetLabelTop(int pos) const
{
static char tmp[128] ;
int len = GetMenuString((HMENU)m_hMenu,pos,tmp,127,MF_BYPOSITION) ;
return wxString(tmp);
}
-bool wxMenuBar::OnDelete(wxMenu *a_menu, const int pos)
+bool wxMenuBar::OnDelete(wxMenu *a_menu, int pos)
{
if (!m_menuBarFrame)
return TRUE;
((wxMenu *)menu)->SetParent(this);
}
-void wxMenuBar::Delete(wxMenu * menu, const int i)
+void wxMenuBar::Delete(wxMenu * menu, int i)
{
int j;
int ii = (int) i;
return -1;
}
-wxMenuItem *wxMenuBar::FindItemForId (const int Id, wxMenu ** itemMenu) const
+wxMenuItem *wxMenuBar::FindItemForId (int Id, wxMenu ** itemMenu) const
{
if (itemMenu)
*itemMenu = NULL;
return NULL;
}
-void wxMenuBar::SetHelpString (const int Id, const wxString& helpString)
+void wxMenuBar::SetHelpString (int Id, const wxString& helpString)
{
int i;
for (i = 0; i < m_menuCount; i++)
}
}
-wxString wxMenuBar::GetHelpString (const int Id) const
+wxString wxMenuBar::GetHelpString (int Id) const
{
int i;
for (i = 0; i < m_menuCount; i++)
extern wxWindow *wxWndHook;
extern LONG APIENTRY _EXPORT wxDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
-bool wxWindow::LoadNativeDialog(wxWindow* parent, const wxWindowID& id)
+bool wxWindow::LoadNativeDialog(wxWindow* parent, wxWindowID& id)
{
m_windowId = id;
wxWndHook = this;
return TRUE;
}
-wxWindow* wxWindow::GetWindowChild1(const wxWindowID& id)
+wxWindow* wxWindow::GetWindowChild1(wxWindowID& id)
{
if ( m_windowId == id )
return this;
return NULL;
}
-wxWindow* wxWindow::GetWindowChild(const wxWindowID& id)
+wxWindow* wxWindow::GetWindowChild(wxWindowID& id)
{
wxWindow* win = GetWindowChild1(id);
if ( !win )
{
}
-wxPalette::wxPalette(const int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue)
+wxPalette::wxPalette(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue)
{
Create(n, red, green, blue);
}
return TRUE;
}
-bool wxPalette::Create(const int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue)
+bool wxPalette::Create(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue)
{
UnRef();
return ::GetNearestPaletteIndex((HPALETTE) M_PALETTEDATA->m_hPalette, PALETTERGB(red, green, blue));
}
-bool wxPalette::GetRGB(const int index, unsigned char *red, unsigned char *green, unsigned char *blue) const
+bool wxPalette::GetRGB(int index, unsigned char *red, unsigned char *green, unsigned char *blue) const
{
if ( !m_refData )
return FALSE;
}
// Should implement Create
-wxPen::wxPen(const wxColour& col, const int Width, const int Style)
+wxPen::wxPen(const wxColour& col, int Width, int Style)
{
m_refData = new wxPenRefData;
wxThePenList->AddPen(this);
}
-wxPen::wxPen(const wxBitmap& stipple, const int Width)
+wxPen::wxPen(const wxBitmap& stipple, int Width)
{
m_refData = new wxPenRefData;
wxThePenList->AddPen(this);
}
-wxPen::wxPen(const wxString& col, const int Width, const int Style)
+wxPen::wxPen(const wxString& col, int Width, int Style)
{
m_refData = new wxPenRefData;
RealizeResource();
}
-void wxPen::SetWidth(const int Width)
+void wxPen::SetWidth(int Width)
{
if ( !M_PENDATA )
m_refData = new wxPenRefData;
RealizeResource();
}
-void wxPen::SetStyle(const int Style)
+void wxPen::SetStyle(int Style)
{
if ( !M_PENDATA )
m_refData = new wxPenRefData;
RealizeResource();
}
-void wxPen::SetDashes(const int nb_dashes, const wxDash *Dash)
+void wxPen::SetDashes(int nb_dashes, const wxDash *Dash)
{
if ( !M_PENDATA )
m_refData = new wxPenRefData;
RealizeResource();
}
-void wxPen::SetJoin(const int Join)
+void wxPen::SetJoin(int Join)
{
if ( !M_PENDATA )
m_refData = new wxPenRefData;
RealizeResource();
}
-void wxPen::SetCap(const int Cap)
+void wxPen::SetCap(int Cap)
{
if ( !M_PENDATA )
m_refData = new wxPenRefData;
IMPLEMENT_DYNAMIC_CLASS(wxPNGFileHandler, wxBitmapHandler)
-bool wxPNGFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, const long flags,
+bool wxPNGFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
int desiredWidth, int desiredHeight)
{
wxPNGReader reader;
return FALSE;
}
-bool wxPNGFileHandler::SaveFile(wxBitmap *bitmap, const wxString& name, const int type, const wxPalette *pal)
+bool wxPNGFileHandler::SaveFile(wxBitmap *bitmap, const wxString& name, int type, const wxPalette *pal)
{
return FALSE;
}
IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)
#endif
-bool wxRadioBox::MSWCommand(const WXUINT param, const WXWORD id)
+bool wxRadioBox::MSWCommand(WXUINT param, WXWORD id)
{
if (param == BN_CLICKED)
{
m_radioHeight = NULL ;
}
-bool wxRadioBox::Create(wxWindow *parent, const wxWindowID id, const wxString& title,
+bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
const wxPoint& pos, const wxSize& size,
- const int n, const wxString choices[],
- const int majorDim, const long style,
+ int n, const wxString choices[],
+ int majorDim, long style,
const wxValidator& val, const wxString& name)
{
m_selectedButton = -1;
}
#if 0
-bool wxRadioBox::Create(wxWindow *parent, const wxWindowID id, const wxString& title,
+bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
const wxPoint& pos, const wxSize& size,
- const int n, const wxBitmap *choices[],
- const int majorDim, const long style,
+ int n, const wxBitmap *choices[],
+ int majorDim, long style,
const wxValidator& val, const wxString& name)
{
m_selectedButton = -1;
}
-wxString wxRadioBox::GetLabel(const int item) const
+wxString wxRadioBox::GetLabel(int item) const
{
GetWindowText((HWND)m_radioButtons[item], wxBuffer, 300);
return wxString(wxBuffer);
}
-void wxRadioBox::SetLabel(const int item, const wxString& label)
+void wxRadioBox::SetLabel(int item, const wxString& label)
{
m_radioWidth[item] = m_radioHeight[item] = -1 ;
SetWindowText((HWND)m_radioButtons[item], (const char *)label);
}
-void wxRadioBox::SetLabel(const int item, wxBitmap *bitmap)
+void wxRadioBox::SetLabel(int item, wxBitmap *bitmap)
{
/*
m_radioWidth[item] = bitmap->GetWidth() + FB_MARGIN ;
return -1;
}
-void wxRadioBox::SetSelection(const int N)
+void wxRadioBox::SetSelection(int N)
{
if ((N < 0) || (N >= m_noItems))
return;
}
// Find string for position
-wxString wxRadioBox::GetString(const int N) const
+wxString wxRadioBox::GetString(int N) const
{
GetWindowText((HWND) m_radioButtons[N], wxBuffer, 1000);
return wxString(wxBuffer);
}
-void wxRadioBox::SetSize(const int x, const int y, const int width, const int height, const int sizeFlags)
+void wxRadioBox::SetSize(int x, int y, int width, int height, int sizeFlags)
{
int currentX, currentY;
GetPosition(¤tX, ¤tY);
int y_offset = yy;
int x_offset = xx;
- float current_width;
-
- float cyf;
+ int current_width, cyf;
int cx1,cy1 ;
wxGetCharSize(m_hWnd, &cx1, &cy1, GetFont());
}
-bool wxRadioBox::Show(const bool show)
+bool wxRadioBox::Show(bool show)
{
int cshow;
if (show)
}
// Enable a specific button
-void wxRadioBox::Enable(const int item, const bool enable)
+void wxRadioBox::Enable(int item, bool enable)
{
if (item<0)
wxWindow::Enable(enable) ;
}
// Enable all controls
-void wxRadioBox::Enable(const bool enable)
+void wxRadioBox::Enable(bool enable)
{
wxControl::Enable(enable);
}
// Show a specific button
-void wxRadioBox::Show(const int item, const bool show)
+void wxRadioBox::Show(int item, bool show)
{
if (item<0)
wxRadioBox::Show(show) ;
}
}
-WXHBRUSH wxRadioBox::OnCtlColor(const WXHDC pDC, const WXHWND pWnd, const WXUINT nCtlColor,
+WXHBRUSH wxRadioBox::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
{
#if CTL3D
// IMPLEMENT_DYNAMIC_CLASS(wxBitmapRadioButton, wxRadioButton)
#endif
-bool wxRadioButton::Create(wxWindow *parent, const wxWindowID id,
+bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
const wxString& label,
const wxPoint& pos,
- const wxSize& size, const long style,
+ const wxSize& size, long style,
const wxValidator& validator,
const wxString& name)
{
// start GRW fix
if (label != "")
{
- float label_width, label_height;
+ int label_width, label_height;
GetTextExtent(label, &label_width, &label_height, NULL, NULL, GetFont());
if (width < 0)
width = (int)(label_width + RADIO_SIZE);
SetWindowText((HWND) GetHWND(), (const char *)label);
}
-void wxRadioButton::SetValue(const bool value)
+void wxRadioButton::SetValue(bool value)
{
// Following necessary for Win32s, because Win32s translate BM_SETCHECK
SendMessage((HWND) GetHWND(), BM_SETCHECK, (WPARAM)value, 0L);
return (SendMessage((HWND) GetHWND(), BM_SETCHECK, 0, 0L) != 0);
}
-WXHBRUSH wxRadioButton::OnCtlColor(const WXHDC pDC, const WXHWND pWnd, const WXUINT nCtlColor,
+WXHBRUSH wxRadioButton::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
{
#if CTL3D
// Not implemented
#if 0
-bool wxBitmapRadioButton::Create(wxWindow *parent, const wxWindowID id,
+bool wxBitmapRadioButton::Create(wxWindow *parent, wxWindowID id,
const wxBitmap *bitmap,
const wxPoint& pos,
- const wxSize& size, const long style,
+ const wxSize& size, long style,
const wxValidator& validator,
const wxString& name)
{
{
}
-void wxBitmapRadioButton::SetValue(const bool value)
+void wxBitmapRadioButton::SetValue(bool value)
{
// Following necessary for Win32s, because Win32s translate BM_SETCHECK
SendMessage((HWND) GetHWND(), BM_SETCHECK, (WPARAM)value, 0L);
#endif
// Scrollbar
-bool wxScrollBar::Create(wxWindow *parent, const wxWindowID id,
+bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos,
- const wxSize& size, const long style,
+ const wxSize& size, long style,
const wxValidator& validator,
const wxString& name)
{
{
}
-void wxScrollBar::MSWOnVScroll(const WXWORD wParam, const WXWORD pos, const WXHWND control)
+void wxScrollBar::MSWOnVScroll(WXWORD wParam, WXWORD pos, WXHWND control)
{
int position = ::GetScrollPos((HWND) control, SB_CTL);
int minPos, maxPos;
}
}
-void wxScrollBar::MSWOnHScroll(const WXWORD wParam, const WXWORD pos, const WXHWND control)
+void wxScrollBar::MSWOnHScroll(WXWORD wParam, WXWORD pos, WXHWND control)
{
MSWOnVScroll(wParam, pos, control);
}
-void wxScrollBar::SetPosition(const int viewStart)
+void wxScrollBar::SetPosition(int viewStart)
{
#if defined(__WIN95__)
SCROLLINFO info;
return ::GetScrollPos((HWND)m_hWnd, SB_CTL);
}
-void wxScrollBar::SetScrollbar(const int position, const int thumbSize, const int range, const int pageSize,
- const bool refresh)
+void wxScrollBar::SetScrollbar(int position, int thumbSize, int range, int pageSize,
+ bool refresh)
{
m_viewSize = pageSize;
m_pageSize = thumbSize;
*/
#if WXWIN_COMPATIBILITY
-void wxScrollBar::SetPageSize(const int pageLength)
+void wxScrollBar::SetPageSize(int pageLength)
{
m_pageSize = pageLength;
#endif
}
-void wxScrollBar::SetObjectLength(const int objectLength)
+void wxScrollBar::SetObjectLength(int objectLength)
{
m_objectSize = objectLength;
#endif
}
-void wxScrollBar::SetViewLength(const int viewLength)
+void wxScrollBar::SetViewLength(int viewLength)
{
m_viewSize = viewLength;
}
}
#endif
-WXHBRUSH wxScrollBar::OnCtlColor(const WXHDC pDC, const WXHWND pWnd, const WXUINT nCtlColor,
+WXHBRUSH wxScrollBar::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
{
return 0;
m_tickFreq = 0;
}
-bool wxSlider95::Create(wxWindow *parent, const wxWindowID id,
- const int value, const int minValue, const int maxValue,
+bool wxSlider95::Create(wxWindow *parent, wxWindowID id,
+ int value, int minValue, int maxValue,
const wxPoint& pos,
- const wxSize& size, const long style,
+ const wxSize& size, long style,
const wxValidator& validator,
const wxString& name)
{
return TRUE;
}
-void wxSlider95::MSWOnVScroll(const WXWORD wParam, const WXWORD pos, const WXHWND control)
+void wxSlider95::MSWOnVScroll(WXWORD wParam, WXWORD pos, WXHWND control)
{
int position = 0; // Dummy - not used in this mode
}
}
-void wxSlider95::MSWOnHScroll(const WXWORD wParam, const WXWORD pos, const WXHWND control)
+void wxSlider95::MSWOnHScroll(WXWORD wParam, WXWORD pos, WXHWND control)
{
MSWOnVScroll(wParam, pos, control);
}
return ::SendMessage((HWND) GetHWND(), TBM_GETPOS, 0, 0);
}
-void wxSlider95::SetValue(const int value)
+void wxSlider95::SetValue(int value)
{
::SendMessage((HWND) GetHWND(), TBM_SETPOS, (WPARAM)TRUE, (LPARAM)value);
if (m_staticValue)
*y = point.y;
}
-void wxSlider95::SetSize(const int x, const int y, const int width, const int height, const int sizeFlags)
+void wxSlider95::SetSize(int x, int y, int width, int height, int sizeFlags)
{
int x1 = x;
int y1 = y;
int cx; // slider,min,max sizes
int cy;
- float cyf;
+ int cyf;
wxGetCharSize(GetHWND(), &cx, &cy,GetFont());
{
if ( m_windowStyle & wxSL_LABELS )
{
- float min_len = 0.0;
+ int min_len = 0;
GetWindowText((HWND) m_staticMin, buf, 300);
GetTextExtent(buf, &min_len, &cyf,NULL,NULL, GetFont());
- float max_len = 0.0;
+ int max_len = 0;
GetWindowText((HWND) m_staticMax, buf, 300);
GetTextExtent(buf, &max_len, &cyf,NULL,NULL, GetFont());
{
if ( m_windowStyle & wxSL_LABELS )
{
- float min_len;
+ int min_len;
GetWindowText((HWND) m_staticMin, buf, 300);
GetTextExtent(buf, &min_len, &cyf,NULL,NULL,GetFont());
- float max_len;
+ int max_len;
GetWindowText((HWND) m_staticMax, buf, 300);
GetTextExtent(buf, &max_len, &cyf,NULL,NULL, GetFont());
}
}
-void wxSlider95::SetRange(const int minValue, const int maxValue)
+void wxSlider95::SetRange(int minValue, int maxValue)
{
m_rangeMin = minValue;
m_rangeMax = maxValue;
}
}
-WXHBRUSH wxSlider95::OnCtlColor(const WXHDC pDC, const WXHWND pWnd, const WXUINT nCtlColor,
+WXHBRUSH wxSlider95::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
{
if ( nCtlColor == CTLCOLOR_SCROLLBAR )
}
// For trackbars only
-void wxSlider95::SetTickFreq(const int n, const int pos)
+void wxSlider95::SetTickFreq(int n, int pos)
{
m_tickFreq = n;
::SendMessage( (HWND) GetHWND(), TBM_SETTICFREQ, (WPARAM) n, (LPARAM) pos );
}
-void wxSlider95::SetPageSize(const int pageSize)
+void wxSlider95::SetPageSize(int pageSize)
{
::SendMessage( (HWND) GetHWND(), TBM_SETPAGESIZE, (WPARAM) 0, (LPARAM) pageSize );
m_pageSize = pageSize;
::SendMessage( (HWND) GetHWND(), TBM_CLEARTICS, (WPARAM) TRUE, (LPARAM) 0 );
}
-void wxSlider95::SetLineSize(const int lineSize)
+void wxSlider95::SetLineSize(int lineSize)
{
m_lineSize = lineSize;
::SendMessage( (HWND) GetHWND(), TBM_SETLINESIZE, (WPARAM) 0, (LPARAM) lineSize );
return (int) ::SendMessage( (HWND) GetHWND(), TBM_GETSELSTART, (WPARAM) 0, (LPARAM) 0 );
}
-void wxSlider95::SetSelection(const int minPos, const int maxPos)
+void wxSlider95::SetSelection(int minPos, int maxPos)
{
::SendMessage( (HWND) GetHWND(), TBM_SETSEL, (WPARAM) TRUE, (LPARAM) MAKELONG( minPos, maxPos) );
}
-void wxSlider95::SetThumbLength(const int len)
+void wxSlider95::SetThumbLength(int len)
{
::SendMessage( (HWND) GetHWND(), TBM_SETTHUMBLENGTH, (WPARAM) len, (LPARAM) 0 );
}
return (int) ::SendMessage( (HWND) GetHWND(), TBM_GETTHUMBLENGTH, (WPARAM) 0, (LPARAM) 0 );
}
-void wxSlider95::SetTick(const int tickPos)
+void wxSlider95::SetTick(int tickPos)
{
::SendMessage( (HWND) GetHWND(), TBM_SETTIC, (WPARAM) 0, (LPARAM) tickPos );
}
ProcessCommand (event);
}
-bool wxSlider95::Show(const bool show)
+bool wxSlider95::Show(bool show)
{
wxWindow::Show(show);
m_tickFreq = 0;
}
-bool wxSliderMSW::Create(wxWindow *parent, const wxWindowID id,
- const int value, const int minValue, const int maxValue,
+bool wxSliderMSW::Create(wxWindow *parent, wxWindowID id,
+ int value, int minValue, int maxValue,
const wxPoint& pos,
- const wxSize& size, const long style,
+ const wxSize& size, long style,
const wxValidator& validator,
const wxString& name)
{
return TRUE;
}
-void wxSliderMSW::MSWOnVScroll(const WXWORD wParam, const WXWORD pos, const WXHWND control)
+void wxSliderMSW::MSWOnVScroll(WXWORD wParam, WXWORD pos, WXHWND control)
{
int position = ::GetScrollPos((HWND)control, SB_CTL);
}
}
-void wxSliderMSW::MSWOnHScroll(const WXWORD wParam, const WXWORD pos, const WXHWND control)
+void wxSliderMSW::MSWOnHScroll(WXWORD wParam, WXWORD pos, WXHWND control)
{
MSWOnVScroll(wParam, pos, control);
}
return ::GetScrollPos((HWND) GetHWND(), SB_CTL);
}
-void wxSliderMSW::SetValue(const int value)
+void wxSliderMSW::SetValue(int value)
{
::SetScrollPos((HWND) GetHWND(), SB_CTL, value, TRUE);
if (m_staticValue)
*y = point.y;
}
-void wxSliderMSW::SetSize(const int x, const int y, const int width, const int height, const int sizeFlags)
+void wxSliderMSW::SetSize(int x, int y, int width, int height, int sizeFlags)
{
int x1 = x;
int y1 = y;
int cx; // slider,min,max sizes
int cy;
- float cyf;
+ int cyf;
wxGetCharSize(GetHWND(), &cx, &cy,GetFont());
{
if ( m_windowStyle & wxSL_LABELS )
{
- float min_len = 0.0;
+ int min_len = 0;
GetWindowText((HWND) m_staticMin, buf, 300);
GetTextExtent(buf, &min_len, &cyf,NULL,NULL, GetFont());
- float max_len = 0.0;
+ int max_len = 0;
GetWindowText((HWND) m_staticMax, buf, 300);
GetTextExtent(buf, &max_len, &cyf,NULL,NULL, GetFont());
{
if ( m_windowStyle & wxSL_LABELS )
{
- float min_len;
+ int min_len;
GetWindowText((HWND) m_staticMin, buf, 300);
GetTextExtent(buf, &min_len, &cyf,NULL,NULL,GetFont());
- float max_len;
+ int max_len;
GetWindowText((HWND) m_staticMax, buf, 300);
GetTextExtent(buf, &max_len, &cyf,NULL,NULL, GetFont());
}
}
-void wxSliderMSW::SetRange(const int minValue, const int maxValue)
+void wxSliderMSW::SetRange(int minValue, int maxValue)
{
m_rangeMin = minValue;
m_rangeMax = maxValue;
}
}
-WXHBRUSH wxSliderMSW::OnCtlColor(const WXHDC pDC, const WXHWND pWnd, const WXUINT nCtlColor,
+WXHBRUSH wxSliderMSW::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
{
if ( nCtlColor == CTLCOLOR_SCROLLBAR )
}
// For trackbars only
-void wxSliderMSW::SetTickFreq(const int n, const int pos)
+void wxSliderMSW::SetTickFreq(int n, int pos)
{
}
-void wxSliderMSW::SetPageSize(const int pageSize)
+void wxSliderMSW::SetPageSize(int pageSize)
{
m_pageSize = pageSize;
}
{
}
-void wxSliderMSW::SetLineSize(const int lineSize)
+void wxSliderMSW::SetLineSize(int lineSize)
{
m_lineSize = lineSize;
}
return 0;
}
-void wxSliderMSW::SetSelection(const int minPos, const int maxPos)
+void wxSliderMSW::SetSelection(int minPos, int maxPos)
{
}
-void wxSliderMSW::SetThumbLength(const int len)
+void wxSliderMSW::SetThumbLength(int len)
{
}
return 0;
}
-void wxSliderMSW::SetTick(const int tickPos)
+void wxSliderMSW::SetTick(int tickPos)
{
}
ProcessCommand (event);
}
-bool wxSliderMSW::Show(const bool show)
+bool wxSliderMSW::Show(bool show)
{
wxWindow::Show(show);
m_max = 100;
}
-bool wxSpinButton::Create(wxWindow *parent, const wxWindowID id, const wxPoint& pos, const wxSize& size,
- const long style, const wxString& name)
+bool wxSpinButton::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
+ long style, const wxString& name)
{
wxSystemSettings settings;
m_backgroundColour = parent->GetDefaultBackgroundColour() ;
return (int) ::SendMessage((HWND) GetHWND(), UDM_GETPOS, 0, 0);
}
-void wxSpinButton::SetValue(const int val)
+void wxSpinButton::SetValue(int val)
{
::SendMessage((HWND) GetHWND(), UDM_SETPOS, 0, (LPARAM) MAKELONG((short) val, 0));
}
-void wxSpinButton::SetRange(const int minVal, const int maxVal)
+void wxSpinButton::SetRange(int minVal, int maxVal)
{
m_min = minVal;
m_max = maxVal;
::SendMessage((HWND) GetHWND(), UDM_SETRANGE, 0, (LPARAM) MAKELONG((short) minVal, (short) maxVal));
}
-void wxSpinButton::MSWOnVScroll(const WXWORD wParam, const WXWORD pos, const WXHWND control)
+void wxSpinButton::MSWOnVScroll(WXWORD wParam, WXWORD pos, WXHWND control)
{
if (control)
{
}
}
-void wxSpinButton::MSWOnHScroll( const WXWORD wParam, const WXWORD pos, const WXHWND control)
+void wxSpinButton::MSWOnHScroll( WXWORD wParam, WXWORD pos, WXHWND control)
{
if (control)
{
}
}
-bool wxSpinButton::MSWCommand(const WXUINT cmd, const WXWORD id)
+bool wxSpinButton::MSWCommand(WXUINT cmd, WXWORD id)
{
// No command messages
return FALSE;
}
-bool wxSpinButton::MSWNotify(const WXWPARAM wParam, const WXLPARAM lParam)
+bool wxSpinButton::MSWNotify(WXWPARAM wParam, WXLPARAM lParam)
{
NMHDR* hdr1 = (NMHDR*) lParam;
switch ( hdr1->code )
* wxStaticBitmap
*/
-bool wxStaticBitmap::Create(wxWindow *parent, const wxWindowID id,
+bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
const wxBitmap& bitmap,
const wxPoint& pos,
const wxSize& size,
- const long style,
+ long style,
const wxString& name)
{
m_messageBitmap = bitmap;
return TRUE;
}
-void wxStaticBitmap::SetSize(const int x, const int y, const int width, const int height, const int sizeFlags)
+void wxStaticBitmap::SetSize(int x, int y, int width, int height, int sizeFlags)
{
int currentX, currentY;
GetPosition(¤tX, ¤tY);
else actualHeight = height;
MoveWindow((HWND) GetHWND(), x1, y1, actualWidth, actualHeight, TRUE);
-
- if (!((width == -1) && (height == -1)))
- {
-#if WXWIN_COMPATIBILITY
- GetEventHandler()->OldOnSize(actualWidth, actualHeight);
-#else
- wxSizeEvent event(wxSize(actualWidth, actualHeight), m_windowId);
- event.eventObject = this;
- GetEventHandler()->ProcessEvent(event);
-#endif
- }
}
void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
* Group box
*/
-bool wxStaticBox::Create(wxWindow *parent, const wxWindowID id,
+bool wxStaticBox::Create(wxWindow *parent, wxWindowID id,
const wxString& label,
const wxPoint& pos,
const wxSize& size,
- const long style,
+ long style,
const wxString& name)
{
SetName(name);
SetWindowText((HWND)m_hWnd, (const char *)label);
}
-void wxStaticBox::SetSize(const int x, const int y, const int width, const int height, const int sizeFlags)
+void wxStaticBox::SetSize(int x, int y, int width, int height, int sizeFlags)
{
int currentX, currentY;
GetPosition(¤tX, ¤tY);
char buf[300];
- float current_width;
+ int current_width;
int cx;
int cy;
- float cyf;
+ int cyf;
HWND button = (HWND)m_hWnd;
wxGetCharSize(GetHWND(), &cx, &cy,GetFont());
if (h1<0)
h1 = (int)(cyf*EDIT_CONTROL_FACTOR) ;
MoveWindow(button, x1, y1, w1, h1, TRUE);
-
-#if WXWIN_COMPATIBILITY
- GetEventHandler()->OldOnSize(width, height);
-#else
- wxSizeEvent event(wxSize(width, height), m_windowId);
- event.eventObject = this;
- GetEventHandler()->ProcessEvent(event);
-#endif
}
-WXHBRUSH wxStaticBox::OnCtlColor(const WXHDC pDC, const WXHWND pWnd, const WXUINT nCtlColor,
+WXHBRUSH wxStaticBox::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
{
#if CTL3D
return TRUE;
}
-void wxStatusBar95::CopyFieldsWidth(const int *widths)
+void wxStatusBar95::CopyFieldsWidth(int *widths)
{
if (widths && !m_statusWidths)
m_statusWidths = new int[m_nFields];
}
}
-void wxStatusBar95::SetFieldsCount(int nFields, const int *widths)
+void wxStatusBar95::SetFieldsCount(int nFields, int *widths)
{
wxASSERT( (nFields > 0) && (nFields < 255) );
SetFieldsWidth();
}
-void wxStatusBar95::SetStatusWidths(int n, const int *widths)
+void wxStatusBar95::SetStatusWidths(int n, int *widths)
{
// @@ I don't understand what this function is for...
wxASSERT( n == m_nFields );
delete [] pWidths;
}
-void wxStatusBar95::SetStatusText(const wxString& strText, const int nField)
+void wxStatusBar95::SetStatusText(const wxString& strText, int nField)
{
if ( !StatusBar_SetText(hwnd, nField, strText) ) {
wxLogDebug("StatusBar_SetText failed");
IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl)
#endif
-bool wxStaticText::Create(wxWindow *parent, const wxWindowID id,
+bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
const wxString& label,
const wxPoint& pos,
const wxSize& size,
- const long style,
+ long style,
const wxString& name)
{
SetName(name);
return TRUE;
}
-void wxStaticText::SetSize(const int x, const int y, const int width, const int height, const int sizeFlags)
+void wxStaticText::SetSize(int x, int y, int width, int height, int sizeFlags)
{
int currentX, currentY;
GetPosition(¤tX, ¤tY);
}
MoveWindow((HWND) GetHWND(), x1, y1, actualWidth, actualHeight, TRUE);
-
- if (!((width == -1) && (height == -1)))
- {
-#if WXWIN_COMPATIBILITY
- GetEventHandler()->OldOnSize(actualWidth, actualHeight);
-#else
- wxSizeEvent event(wxSize(actualWidth, actualHeight), m_windowId);
- event.eventObject = this;
- GetEventHandler()->ProcessEvent(event);
-#endif
- }
}
void wxStaticText::SetLabel(const wxString& label)
{
- float w, h;
+ int w, h;
RECT rect;
wxWindow *parent = GetParent();
SetWindowText((HWND) GetHWND(), (const char *)label);
}
-WXHBRUSH wxStaticText::OnCtlColor(const WXHDC pDC, const WXHWND pWnd, const WXUINT nCtlColor,
+WXHBRUSH wxStaticText::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
{
/*
{
}
-bool wxTabCtrl::MSWCommand(const WXUINT cmd, const WXWORD id)
+bool wxTabCtrl::MSWCommand(WXUINT cmd, WXWORD id)
{
return FALSE;
}
-bool wxTabCtrl::MSWNotify(const WXWPARAM wParam, const WXLPARAM lParam)
+bool wxTabCtrl::MSWNotify(WXWPARAM wParam, WXLPARAM lParam)
{
wxTabEvent event(wxEVT_NULL, m_windowId);
wxEventType eventType = wxEVT_NULL;
m_defaultHeight = DEFAULTBITMAPY;
}
-bool wxToolBar95::Create(wxWindow *parent, const wxWindowID id, const wxPoint& pos, const wxSize& size,
- const long style, const int orientation,
- const int RowsOrColumns, const wxString& name)
+bool wxToolBar95::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
+ long style, int orientation,
+ int RowsOrColumns, const wxString& name)
{
m_backgroundColour = wxColour(GetRValue(GetSysColor(COLOR_BTNFACE)),
GetGValue(GetSysColor(COLOR_BTNFACE)), GetBValue(GetSysColor(COLOR_BTNFACE)));
return TRUE;
}
-bool wxToolBar95::MSWCommand(const WXUINT cmd, const WXWORD id)
+bool wxToolBar95::MSWCommand(WXUINT cmd, WXWORD id)
{
wxNode *node = m_tools.Find((long)id);
if (!node)
return TRUE;
}
-bool wxToolBar95::MSWNotify(const WXWPARAM WXUNUSED(wParam), const WXLPARAM lParam)
+bool wxToolBar95::MSWNotify(WXWPARAM WXUNUSED(wParam), WXLPARAM lParam)
{
// First check if this applies to us
NMHDR *hdr = (NMHDR *)lParam;
::SendMessage((HWND) GetHWND(), TB_SETBITMAPSIZE, 0, (LPARAM) MAKELONG ((int)size.x, (int)size.y));
}
-void wxToolBar95::SetRows(const int nRows)
+void wxToolBar95::SetRows(int nRows)
{
RECT rect;
::SendMessage((HWND) GetHWND(), TB_SETROWS, MAKEWPARAM(nRows, TRUE), (LPARAM) & rect);
return wxSize(m_defaultWidth + 8, m_defaultHeight + 7);
}
-void wxToolBar95::EnableTool(const int toolIndex, const bool enable)
+void wxToolBar95::EnableTool(int toolIndex, bool enable)
{
wxNode *node = m_tools.Find((long)toolIndex);
if (node)
}
}
-void wxToolBar95::ToggleTool(const int toolIndex, const bool toggle)
+void wxToolBar95::ToggleTool(int toolIndex, bool toggle)
{
wxNode *node = m_tools.Find((long)toolIndex);
if (node)
// If pushedBitmap is NULL, a reversed version of bitmap is
// created and used as the pushed/toggled image.
// If toggle is TRUE, the button toggles between the two states.
-wxToolBarTool *wxToolBar95::AddTool(const int index, const wxBitmap& bitmap, const wxBitmap& pushedBitmap,
- const bool toggle, const long xPos, const long yPos, wxObject *clientData, const wxString& helpString1, const wxString& helpString2)
+wxToolBarTool *wxToolBar95::AddTool(int index, const wxBitmap& bitmap, const wxBitmap& pushedBitmap,
+ bool toggle, long xPos, long yPos, wxObject *clientData, const wxString& helpString1, const wxString& helpString2)
{
wxToolBarTool *tool = new wxToolBarTool(index, bitmap, (wxBitmap *)NULL, toggle, xPos, yPos, helpString1, helpString2);
tool->m_clientData = clientData;
m_defaultHeight = DEFAULTBITMAPY;
}
-bool wxToolBarMSW::Create(wxWindow *parent, const wxWindowID id, const wxPoint& pos, const wxSize& size,
- const long style, const int orientation,
- const int RowsOrColumns, const wxString& name)
+bool wxToolBarMSW::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
+ long style, int orientation,
+ int RowsOrColumns, const wxString& name)
{
if ( ! wxWindow::Create(parent, id, pos, size, style, name) )
return FALSE;
// This function enables/disables a toolbar tool and redraws it.
// If that would not be done, the enabling/disabling wouldn't be
// visible on the screen.
-void wxToolBarMSW::EnableTool(const int toolIndex, const bool enable)
+void wxToolBarMSW::EnableTool(int toolIndex, bool enable)
{
wxNode *node = m_tools.Find((long)toolIndex);
if (node)
// If pushedBitmap is NULL, a reversed version of bitmap is
// created and used as the pushed/toggled image.
// If toggle is TRUE, the button toggles between the two states.
-wxToolBarTool *wxToolBarMSW::AddTool(const int index, const wxBitmap& bitmap, const wxBitmap& pushedBitmap,
- const bool toggle, const long xPos, const long yPos, wxObject *clientData, const wxString& helpString1, const wxString& helpString2)
+wxToolBarTool *wxToolBarMSW::AddTool(int index, const wxBitmap& bitmap, const wxBitmap& pushedBitmap,
+ bool toggle, long xPos, long yPos, wxObject *clientData, const wxString& helpString1, const wxString& helpString2)
{
// Using bitmap2 can cause problems (don't know why!)
m_isRich = FALSE;
}
-bool wxTextCtrl::Create(wxWindow *parent, const wxWindowID id,
+bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
const wxString& value,
const wxPoint& pos,
- const wxSize& size, const long style,
+ const wxSize& size, long style,
const wxValidator& validator,
const wxString& name)
{
SetWindowText((HWND) GetHWND(), (const char *)value);
}
-void wxTextCtrl::SetSize(const int x, const int y, const int width, const int height, const int sizeFlags)
+void wxTextCtrl::SetSize(int x, int y, int width, int height, int sizeFlags)
{
int currentX, currentY;
GetPosition(¤tX, ¤tY);
MoveWindow((HWND) GetHWND(), (int)control_x, (int)control_y,
(int)control_width, (int)control_height, TRUE);
-/*
-#if WXWIN_COMPATIBILITY
- GetEventHandler()->OldOnSize(width, height);
-#else
- wxSizeEvent event(wxSize(width, height), m_windowId);
- event.eventObject = this;
- GetEventHandler()->ProcessEvent(event);
-#endif
-*/
}
// Clipboard operations
SendMessage(hWnd, WM_PASTE, 0, 0L);
}
-void wxTextCtrl::SetEditable(const bool editable)
+void wxTextCtrl::SetEditable(bool editable)
{
HWND hWnd = (HWND) GetHWND();
SendMessage(hWnd, EM_SETREADONLY, (WPARAM)!editable, (LPARAM)0L);
}
-void wxTextCtrl::SetInsertionPoint(const long pos)
+void wxTextCtrl::SetInsertionPoint(long pos)
{
HWND hWnd = (HWND) GetHWND();
#ifdef __WIN32__
return (long)(charIndex + lineLength);
}
-void wxTextCtrl::Replace(const long from, const long to, const wxString& value)
+void wxTextCtrl::Replace(long from, long to, const wxString& value)
{
HWND hWnd = (HWND) GetHWND();
long fromChar = from;
SendMessage(hWnd, WM_PASTE, (WPARAM)0, (LPARAM)0L);
}
-void wxTextCtrl::Remove(const long from, const long to)
+void wxTextCtrl::Remove(long from, long to)
{
HWND hWnd = (HWND) GetHWND();
long fromChar = from;
SendMessage(hWnd, WM_CUT, (WPARAM)0, (LPARAM)0);
}
-void wxTextCtrl::SetSelection(const long from, const long to)
+void wxTextCtrl::SetSelection(long from, long to)
{
HWND hWnd = (HWND) GetHWND();
long fromChar = from;
return (int)SendMessage((HWND) GetHWND(), EM_GETLINECOUNT, (WPARAM)0, (LPARAM)0);
}
-long wxTextCtrl::XYToPosition(const long x, const long y) const
+long wxTextCtrl::XYToPosition(long x, long y) const
{
HWND hWnd = (HWND) GetHWND();
return (long)(x + charIndex);
}
-void wxTextCtrl::PositionToXY(const long pos, long *x, long *y) const
+void wxTextCtrl::PositionToXY(long pos, long *x, long *y) const
{
HWND hWnd = (HWND) GetHWND();
*y = (long)lineNo;
}
-void wxTextCtrl::ShowPosition(const long pos)
+void wxTextCtrl::ShowPosition(long pos)
{
HWND hWnd = (HWND) GetHWND();
(void)SendMessage(hWnd, EM_LINESCROLL, (WPARAM)0, (LPARAM)MAKELPARAM(linesToScroll, 0));
}
-int wxTextCtrl::GetLineLength(const long lineNo) const
+int wxTextCtrl::GetLineLength(long lineNo) const
{
long charIndex = XYToPosition(0, lineNo);
HWND hWnd = (HWND) GetHWND();
return len;
}
-wxString wxTextCtrl::GetLineText(const long lineNo) const
+wxString wxTextCtrl::GetLineText(long lineNo) const
{
HWND hWnd = (HWND) GetHWND();
*(WORD *)wxBuffer = 512;
return *this;
}
-wxTextCtrl& wxTextCtrl::operator<<(const float f)
+wxTextCtrl& wxTextCtrl::operator<<(float f)
{
static char buf[100];
sprintf(buf, "%.2f", f);
return *this;
}
-wxTextCtrl& wxTextCtrl::operator<<(const double d)
+wxTextCtrl& wxTextCtrl::operator<<(double d)
{
static char buf[100];
sprintf(buf, "%.2f", d);
return *this;
}
-wxTextCtrl& wxTextCtrl::operator<<(const int i)
+wxTextCtrl& wxTextCtrl::operator<<(int i)
{
static char buf[100];
sprintf(buf, "%i", i);
return *this;
}
-wxTextCtrl& wxTextCtrl::operator<<(const long i)
+wxTextCtrl& wxTextCtrl::operator<<(long i)
{
static char buf[100];
sprintf(buf, "%ld", i);
}
-WXHBRUSH wxTextCtrl::OnCtlColor(const WXHDC pDC, const WXHWND pWnd, const WXUINT nCtlColor,
+WXHBRUSH wxTextCtrl::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
{
#if CTL3D
// wxWindow::OnEraseBackground(event);
}
-bool wxTextCtrl::MSWCommand(const WXUINT param, const WXWORD WXUNUSED(id))
+bool wxTextCtrl::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
{
/*
// Debugging
// For Rich Edit controls. Do we need it?
#if 0
#if defined(__WIN95__)
-bool wxTextCtrl::MSWNotify(const WXWPARAM wParam, const WXLPARAM lParam)
+bool wxTextCtrl::MSWNotify(WXWPARAM wParam, WXLPARAM lParam)
{
wxCommandEvent event(0, m_windowId);
int eventType = 0;
m_imageListState = NULL;
}
-bool wxTreeCtrl::Create(wxWindow *parent, const wxWindowID id, const wxPoint& pos, const wxSize& size,
- const long style, const wxValidator& validator, const wxString& name)
+bool wxTreeCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
+ long style, const wxValidator& validator, const wxString& name)
{
wxSystemSettings settings;
SetBackgroundColour(settings.GetSystemColour(wxSYS_COLOUR_WINDOW));
TreeView_SetIndent((HWND) GetHWND(), indent);
}
-wxImageList *wxTreeCtrl::GetImageList(const int which) const
+wxImageList *wxTreeCtrl::GetImageList(int which) const
{
if ( which == wxIMAGE_LIST_NORMAL )
{
return NULL;
}
-void wxTreeCtrl::SetImageList(wxImageList *imageList, const int which)
+void wxTreeCtrl::SetImageList(wxImageList *imageList, int which)
{
int flags = 0;
if ( which == wxIMAGE_LIST_NORMAL )
TreeView_SetImageList((HWND) GetHWND(), (HIMAGELIST) imageList ? imageList->GetHIMAGELIST() : 0, flags);
}
-long wxTreeCtrl::GetNextItem(const long item, int code) const
+long wxTreeCtrl::GetNextItem(long item, int code) const
{
UINT flag = 0;
switch ( code )
return (long) TreeView_GetNextItem( (HWND) GetHWND(), (HTREEITEM) item, flag);
}
-bool wxTreeCtrl::ItemHasChildren(const long item) const
+bool wxTreeCtrl::ItemHasChildren(long item) const
{
TV_ITEM item2;
item2.hItem = (HTREEITEM) item;
return (item2.cChildren != 0);
}
-long wxTreeCtrl::GetChild(const long item) const
+long wxTreeCtrl::GetChild(long item) const
{
return (long) ::SendMessage((HWND) GetHWND(), TVM_GETNEXTITEM, TVGN_CHILD, (LPARAM)item);
}
-long wxTreeCtrl::GetParent(const long item) const
+long wxTreeCtrl::GetParent(long item) const
{
return (long) ::SendMessage((HWND) GetHWND(), TVM_GETNEXTITEM, TVGN_PARENT, (LPARAM)item);
}
return (long) ::SendMessage((HWND) GetHWND(), TVM_GETNEXTITEM, TVGN_FIRSTVISIBLE, 0);
}
-long wxTreeCtrl::GetNextVisibleItem(const long item) const
+long wxTreeCtrl::GetNextVisibleItem(long item) const
{
return (long) ::SendMessage((HWND) GetHWND(), TVM_GETNEXTITEM, TVGN_NEXTVISIBLE, (LPARAM)item);
}
return (::SendMessage((HWND) GetHWND(), TVM_SETITEM, 0, (LPARAM)&item) != 0);
}
-int wxTreeCtrl::GetItemState(const long item, const long stateMask) const
+int wxTreeCtrl::GetItemState(long item, long stateMask) const
{
wxTreeItem info;
return info.m_state;
}
-bool wxTreeCtrl::SetItemState(const long item, const long state, const long stateMask)
+bool wxTreeCtrl::SetItemState(long item, long state, long stateMask)
{
wxTreeItem info;
return SetItem(info);
}
-bool wxTreeCtrl::SetItemImage(const long item, const int image, const int selImage)
+bool wxTreeCtrl::SetItemImage(long item, int image, int selImage)
{
wxTreeItem info;
return SetItem(info);
}
-wxString wxTreeCtrl::GetItemText(const long item) const
+wxString wxTreeCtrl::GetItemText(long item) const
{
wxTreeItem info;
return info.m_text;
}
-void wxTreeCtrl::SetItemText(const long item, const wxString& str)
+void wxTreeCtrl::SetItemText(long item, const wxString& str)
{
wxTreeItem info;
SetItem(info);
}
-long wxTreeCtrl::GetItemData(const long item) const
+long wxTreeCtrl::GetItemData(long item) const
{
wxTreeItem info;
return info.m_data;
}
-bool wxTreeCtrl::SetItemData(const long item, long data)
+bool wxTreeCtrl::SetItemData(long item, long data)
{
wxTreeItem info;
return SetItem(info);
}
-bool wxTreeCtrl::GetItemRect(const long item, wxRectangle& rect, bool textOnly) const
+bool wxTreeCtrl::GetItemRect(long item, wxRectangle& rect, bool textOnly) const
{
RECT rect2;
}
// Operations
-bool wxTreeCtrl::DeleteItem(const long item)
+bool wxTreeCtrl::DeleteItem(long item)
{
return (TreeView_DeleteItem((HWND) GetHWND(), (HTREEITEM) item) != 0);
}
-bool wxTreeCtrl::ExpandItem(const long item, const int action)
+bool wxTreeCtrl::ExpandItem(long item, int action)
{
UINT mswAction = TVE_EXPAND;
switch ( action )
return (TreeView_Expand((HWND) GetHWND(), (HTREEITEM) item, mswAction) != 0);
}
-long wxTreeCtrl::InsertItem(const long parent, wxTreeItem& info, const long insertAfter)
+long wxTreeCtrl::InsertItem(long parent, wxTreeItem& info, long insertAfter)
{
TV_INSERTSTRUCT tvInsertStruct;
tvInsertStruct.hParent = (HTREEITEM) parent ;
return (long) TreeView_InsertItem((HWND) GetHWND(), & tvInsertStruct);
}
-long wxTreeCtrl::InsertItem(const long parent, const wxString& label, const int image, const int selImage,
- const long insertAfter)
+long wxTreeCtrl::InsertItem(long parent, const wxString& label, int image, int selImage,
+ long insertAfter)
{
wxTreeItem info;
info.m_text = label;
return InsertItem(parent, info, insertAfter);
}
-bool wxTreeCtrl::SelectItem(const long item)
+bool wxTreeCtrl::SelectItem(long item)
{
return (TreeView_SelectItem((HWND) GetHWND(), (HTREEITEM) item) != 0);
}
-bool wxTreeCtrl::ScrollTo(const long item)
+bool wxTreeCtrl::ScrollTo(long item)
{
return (TreeView_SelectSetFirstVisible((HWND) GetHWND(), (HTREEITEM) item) != 0);
}
return (TreeView_DeleteAllItems((HWND) GetHWND()) != 0);
}
-wxTextCtrl& wxTreeCtrl::Edit(const long item)
+wxTextCtrl& wxTreeCtrl::Edit(long item)
{
HWND hWnd = (HWND) TreeView_EditLabel((HWND) GetHWND(), item);
m_textCtrl.SetHWND((WXHWND) hWnd);
}
/*
-wxImageList *wxTreeCtrl::CreateDragImage(const long item)
+wxImageList *wxTreeCtrl::CreateDragImage(long item)
{
}
*/
-bool wxTreeCtrl::SortChildren(const long item)
+bool wxTreeCtrl::SortChildren(long item)
{
return (TreeView_SortChildren((HWND) GetHWND(), (HTREEITEM) item, 0) != 0);
}
-bool wxTreeCtrl::EnsureVisible(const long item)
+bool wxTreeCtrl::EnsureVisible(long item)
{
return (TreeView_EnsureVisible((HWND) GetHWND(), (HTREEITEM) item) != 0);
}
-bool wxTreeCtrl::MSWCommand(const WXUINT cmd, const WXWORD id)
+bool wxTreeCtrl::MSWCommand(WXUINT cmd, WXWORD id)
{
if (cmd == EN_UPDATE)
{
else return FALSE;
}
-bool wxTreeCtrl::MSWNotify(const WXWPARAM wParam, const WXLPARAM lParam)
+bool wxTreeCtrl::MSWNotify(WXWPARAM wParam, WXLPARAM lParam)
{
wxTreeEvent event(wxEVT_NULL, m_windowId);
wxEventType eventType = wxEVT_NULL;
#endif
// Find an item given the MS Windows id
-wxWindow *wxWindow::FindItem(const int id) const
+wxWindow *wxWindow::FindItem(int id) const
{
if (!GetChildren())
return NULL;
}
// Find an item given the MS Windows handle
-wxWindow *wxWindow::FindItemByHWND(const WXHWND hWnd, bool controlOnly) const
+wxWindow *wxWindow::FindItemByHWND(WXHWND hWnd, bool controlOnly) const
{
if (!GetChildren())
return NULL;
}
// Default command handler
-bool wxWindow::MSWCommand(const WXUINT WXUNUSED(param), const WXWORD WXUNUSED(id))
+bool wxWindow::MSWCommand(WXUINT WXUNUSED(param), WXWORD WXUNUSED(id))
{
return FALSE;
}
-bool wxWindow::MSWNotify(const WXWPARAM WXUNUSED(wParam), const WXLPARAM WXUNUSED(lParam))
+bool wxWindow::MSWNotify(WXWPARAM WXUNUSED(wParam), WXLPARAM WXUNUSED(lParam))
{
return FALSE;
}
-void wxWindow::PreDelete(const WXHDC WXUNUSED(dc))
+void wxWindow::PreDelete(WXHDC WXUNUSED(dc))
{
}
extern char wxCanvasClassName[];
// Constructor
-bool wxWindow::Create(wxWindow *parent, const wxWindowID id,
+bool wxWindow::Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos,
const wxSize& size,
- const long style,
+ long style,
const wxString& name)
{
// Generic
::SetFocus(hWnd);
}
-void wxWindow::Enable(const bool enable)
+void wxWindow::Enable(bool enable)
{
m_winEnabled = enable;
HWND hWnd = (HWND) GetHWND();
// I think we should retain the old-style
// DragAcceptFiles in parallel with SetDropTarget.
// JACS
-void wxWindow::DragAcceptFiles(const bool accept)
+void wxWindow::DragAcceptFiles(bool accept)
{
HWND hWnd = (HWND) GetHWND();
if (hWnd)
*y = rect.bottom;
}
-void wxWindow::SetSize(const int x, const int y, const int width, const int height, const int sizeFlags)
+void wxWindow::SetSize(int x, int y, int width, int height, int sizeFlags)
{
int currentX, currentY;
GetPosition(¤tX, ¤tY);
HWND hWnd = (HWND) GetHWND();
if (hWnd)
MoveWindow(hWnd, actualX, actualY, actualWidth, actualHeight, (BOOL)TRUE);
-
-/* Not needed? should be called anyway via MoveWindow
- if (!(width == -1) && (height == -1))
- {
-#if WXWIN_COMPATIBILITY
- GetEventHandler()->OldOnSize(width, height);
-#else
- wxSizeEvent event(wxSize(width, height), m_windowId);
- event.eventObject = this;
- GetEventHandler()->ProcessEvent(event);
-#endif
- }
-*/
}
-void wxWindow::SetClientSize(const int width, const int height)
+void wxWindow::SetClientSize(int width, int height)
{
wxWindow *parent = GetParent();
HWND hWnd = (HWND) GetHWND();
}
MoveWindow(hWnd, point.x, point.y, actual_width, actual_height, (BOOL)TRUE);
-#if WXWIN_COMPATIBILITY
- GetEventHandler()->OldOnSize(width, height);
-#else
+
wxSizeEvent event(wxSize(width, height), m_windowId);
- event.m_eventObject = this;
+ event.SetEventObject(this);
GetEventHandler()->ProcessEvent(event);
-#endif
}
-bool wxWindow::Show(const bool show)
+bool wxWindow::Show(bool show)
{
HWND hWnd = (HWND) GetHWND();
int cshow;
}
void wxWindow::GetTextExtent(const wxString& string, int *x, int *y,
- int *descent, int *externalLeading, const wxFont *theFont, const bool) const
+ int *descent, int *externalLeading, const wxFont *theFont, bool) const
{
wxFont *fontToUse = (wxFont *)theFont;
if (!fontToUse)
// fontToUse->ReleaseResource();
}
-#if WXWIN_COMPATIBILITY
-void wxWindow::GetTextExtent(const wxString& string, float *x, float *y,
- float *descent,
- float *externalLeading,
- const wxFont *theFont, const bool use16) const
- {
- int x1, y1, descent1, externalLeading1;
- GetTextExtent(string, &x1, &y1, &descent1, &externalLeading1, theFont, use16);
- *x = x1; *y = y1;
- if ( descent )
- *descent = descent1;
- if ( externalLeading )
- *externalLeading = externalLeading1;
- }
-#endif
-
-void wxWindow::Refresh(const bool eraseBack, const wxRectangle *rect)
+void wxWindow::Refresh(bool eraseBack, const wxRectangle *rect)
{
HWND hWnd = (HWND) GetHWND();
if (hWnd)
#endif
}
-void wxWindow::MSWCreate(const int id, wxWindow *parent, const char *wclass, wxWindow *wx_win, const char *title,
- const int x, const int y, const int width, const int height,
- const WXDWORD style, const char *dialog_template, const WXDWORD extendedStyle)
+void wxWindow::MSWCreate(int id, wxWindow *parent, const char *wclass, wxWindow *wx_win, const char *title,
+ int x, int y, int width, int height,
+ WXDWORD style, const char *dialog_template, WXDWORD extendedStyle)
{
bool is_dialog = (dialog_template != NULL);
int x1 = CW_USEDEFAULT;
// Deal with child commands from buttons etc.
-bool wxWindow::MSWOnNotify(const WXWPARAM wParam, const WXLPARAM lParam)
+bool wxWindow::MSWOnNotify(WXWPARAM wParam, WXLPARAM lParam)
{
#if defined(__WIN95__)
// Find a child window to send the notification to, e.g. a toolbar.
return FALSE;
}
-void wxWindow::MSWOnMenuHighlight(const WXWORD WXUNUSED(item), const WXWORD WXUNUSED(flags), const WXHMENU WXUNUSED(sysmenu))
+void wxWindow::MSWOnMenuHighlight(WXWORD WXUNUSED(item), WXWORD WXUNUSED(flags), WXHMENU WXUNUSED(sysmenu))
{
#if DEBUG > 1
wxDebugMsg("wxWindow::MSWOnMenuHighlight %d\n", handle);
#endif
}
-void wxWindow::MSWOnInitMenuPopup(const WXHMENU menu, const int pos, const bool isSystem)
+void wxWindow::MSWOnInitMenuPopup(WXHMENU menu, int pos, bool isSystem)
{
+/*
if (!isSystem)
OldOnInitMenuPopup(pos);
+*/
}
-bool wxWindow::MSWOnActivate(const int state, const bool WXUNUSED(minimized), const WXHWND WXUNUSED(activate))
+bool wxWindow::MSWOnActivate(int state, bool WXUNUSED(minimized), WXHWND WXUNUSED(activate))
{
#if DEBUG > 1
wxDebugMsg("wxWindow::MSWOnActivate %d\n", handle);
#endif
-#if WXWIN_COMPATIBILITY
- GetEventHandler()->OldOnActivate(((state == WA_ACTIVE) || (state == WA_CLICKACTIVE)));
-#else
wxActivateEvent event(wxEVT_ACTIVATE, ((state == WA_ACTIVE) || (state == WA_CLICKACTIVE)),
m_windowId);
- event.m_eventObject = this;
+ event.SetEventObject(this);
GetEventHandler()->ProcessEvent(event);
-#endif
return 0;
}
-bool wxWindow::MSWOnSetFocus(const WXHWND WXUNUSED(hwnd))
+bool wxWindow::MSWOnSetFocus(WXHWND WXUNUSED(hwnd))
{
#if DEBUG > 1
wxDebugMsg("wxWindow::MSWOnSetFocus %d\n", m_hWnd);
::ShowCaret((HWND) GetHWND());
}
-#if WXWIN_COMPATIBILITY
- GetEventHandler()->OldOnSetFocus();
-#else
wxFocusEvent event(wxEVT_SET_FOCUS, m_windowId);
- event.m_eventObject = this;
- GetEventHandler()->ProcessEvent(event);
-#endif
- return TRUE;
+ event.SetEventObject(this);
+ if (!GetEventHandler()->ProcessEvent(event))
+ Default();
+ return TRUE;
}
-bool wxWindow::MSWOnKillFocus(const WXHWND WXUNUSED(hwnd))
+bool wxWindow::MSWOnKillFocus(WXHWND WXUNUSED(hwnd))
{
#if DEBUG > 1
wxDebugMsg("wxWindow::MSWOnKillFocus %d\n", m_hWnd);
::DestroyCaret();
}
-#if WXWIN_COMPATIBILITY
- GetEventHandler()->OldOnKillFocus();
-#else
wxFocusEvent event(wxEVT_KILL_FOCUS, m_windowId);
- event.m_eventObject = this;
- GetEventHandler()->ProcessEvent(event);
-#endif
+ event.SetEventObject(this);
+ if (!GetEventHandler()->ProcessEvent(event))
+ Default();
return TRUE;
}
-void wxWindow::MSWOnDropFiles(const WXWPARAM wParam)
+void wxWindow::MSWOnDropFiles(WXWPARAM wParam)
{
#if DEBUG > 1
wxDebugMsg("wxWindow::MSWOnDropFiles %d\n", m_hWnd);
event.m_eventObject = this;
event.m_pos.x = dropPoint.x; event.m_pos.x = dropPoint.y;
- GetEventHandler()->ProcessEvent(event);
+ if (!GetEventHandler()->ProcessEvent(event))
+ Default();
delete[] files;
}
-bool wxWindow::MSWOnDrawItem(const int id, WXDRAWITEMSTRUCT *itemStruct)
+bool wxWindow::MSWOnDrawItem(int id, WXDRAWITEMSTRUCT *itemStruct)
{
#if USE_OWNER_DRAWN
if ( id == 0 ) { // is it a menu item?
return FALSE;
}
-bool wxWindow::MSWOnMeasureItem(const int id, WXMEASUREITEMSTRUCT *itemStruct)
+bool wxWindow::MSWOnMeasureItem(int id, WXMEASUREITEMSTRUCT *itemStruct)
{
#if USE_OWNER_DRAWN
if ( id == 0 ) { // is it a menu item?
return FALSE;
}
-WXHBRUSH wxWindow::MSWOnCtlColor(const WXHDC pDC, const WXHWND pWnd, const WXUINT nCtlColor,
- const WXUINT message, const WXWPARAM wParam, const WXLPARAM lParam)
+WXHBRUSH wxWindow::MSWOnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
+ WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
{
#if DEBUG > 1
wxDebugMsg("wxWindow::MSWOnCtlColour %d\n", m_hWnd);
}
// Define for each class of dialog and control
-WXHBRUSH wxWindow::OnCtlColor(const WXHDC pDC, const WXHWND pWnd, const WXUINT nCtlColor,
+WXHBRUSH wxWindow::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
{
return (WXHBRUSH) MSWDefWindowProc(message, wParam, lParam);
}
-bool wxWindow::MSWOnColorChange(const WXHWND hWnd, const WXUINT message, const WXWPARAM wParam, const WXLPARAM lParam)
+bool wxWindow::MSWOnColorChange(WXHWND hWnd, WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
{
wxSysColourChangedEvent event;
event.m_eventObject = this;
if (GetEventHandler()->ProcessEvent(event))
return 0;
-#if WXWIN_COMPATIBILITY
- if (GetEventHandler()->OldOnSysColourChange())
- return 0;
-#endif
-
// We didn't process it
return 1;
}
}
}
-long wxWindow::MSWOnMDIActivate(const long WXUNUSED(flag), const WXHWND WXUNUSED(activate), const WXHWND WXUNUSED(deactivate))
+long wxWindow::MSWOnMDIActivate(long WXUNUSED(flag), WXHWND WXUNUSED(activate), WXHWND WXUNUSED(deactivate))
{
#if DEBUG > 1
wxDebugMsg("wxWindow::MSWOnMDIActivate %d\n", m_hWnd);
bool wxWindow::MSWOnPaint(void)
{
-#if WXWIN_COMPATIBILITY
- GetEventHandler()->OldOnPaint();
-#else
wxPaintEvent event(m_windowId);
- event.m_eventObject = this;
- GetEventHandler()->ProcessEvent(event);
-#endif
+ event.SetEventObject(this);
+ if (!GetEventHandler()->ProcessEvent(event))
+ Default();
return TRUE;
}
-void wxWindow::MSWOnSize(const int w, const int h, const WXUINT WXUNUSED(flag))
+void wxWindow::MSWOnSize(int w, int h, WXUINT WXUNUSED(flag))
{
if (m_inOnSize)
return;
m_inOnSize = TRUE;
-#if WXWIN_COMPATIBILITY
- GetEventHandler()->OldOnSize(w, h);
-#else
wxSizeEvent event(wxSize(w, h), m_windowId);
- event.m_eventObject = this;
- GetEventHandler()->ProcessEvent(event);
-#endif
+ event.SetEventObject(this);
+ if (!GetEventHandler()->ProcessEvent(event))
+ Default();
m_inOnSize = FALSE;
}
}
// Deal with child commands from buttons etc.
-bool wxWindow::MSWOnCommand(const WXWORD id, const WXWORD cmd, const WXHWND WXUNUSED(control))
+bool wxWindow::MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND WXUNUSED(control))
{
#if DEBUG > 1
wxDebugMsg("wxWindow::MSWOnCommand\n");
return 0;
}
-void wxWindow::MSWOnLButtonDown(const int x, const int y, const WXUINT flags)
+void wxWindow::MSWOnLButtonDown(int x, int y, WXUINT flags)
{
-#if 0 // defined(__WIN32__) && !defined(WIN95)
- // DClick not clean supported on Win3.1, except if someone know
- // how to emulate Sleep()...
- // This means that your app will receive Down-Up-Dclick sequences
- // rather than Dclick
- if (m_doubleClickAllowed)
- {
- UINT time = GetDoubleClickTime() ;
- Sleep(time) ;
- MSG dummy ;
- if (PeekMessage(&dummy,m_hWnd,
- WM_LBUTTONDBLCLK,WM_LBUTTONDBLCLK,
- PM_NOREMOVE)
- )
- {
- PeekMessage(&dummy,m_hWnd,WM_LBUTTONUP,WM_LBUTTONUP,PM_REMOVE);
- return;
- }
- }
-#endif
-
wxMouseEvent event(wxEVT_LEFT_DOWN);
event.m_x = x; event.m_y = y;
event.m_eventObject = this;
m_lastXPos = event.m_x; m_lastYPos = event.m_y; m_lastEvent = wxEVENT_TYPE_LEFT_DOWN;
- GetEventHandler()->OldOnMouseEvent(event);
+
+ if (!GetEventHandler()->ProcessEvent(event))
+ Default();
}
-void wxWindow::MSWOnLButtonUp(const int x, const int y, const WXUINT flags)
+void wxWindow::MSWOnLButtonUp(int x, int y, WXUINT flags)
{
wxMouseEvent event(wxEVT_LEFT_UP);
m_lastXPos = event.m_x; m_lastYPos = event.m_y; m_lastEvent = wxEVT_LEFT_UP;
- GetEventHandler()->OldOnMouseEvent(event);
+ if (!GetEventHandler()->ProcessEvent(event))
+ Default();
}
-void wxWindow::MSWOnLButtonDClick(const int x, const int y, const WXUINT flags)
+void wxWindow::MSWOnLButtonDClick(int x, int y, WXUINT flags)
{
wxMouseEvent event(wxEVT_LEFT_DCLICK);
m_lastXPos = event.m_x; m_lastYPos = event.m_y; m_lastEvent = wxEVT_LEFT_DCLICK;
-// if (m_doubleClickAllowed)
- GetEventHandler()->OldOnMouseEvent(event);
+ if (!GetEventHandler()->ProcessEvent(event))
+ Default();
}
-void wxWindow::MSWOnMButtonDown(const int x, const int y, const WXUINT flags)
+void wxWindow::MSWOnMButtonDown(int x, int y, WXUINT flags)
{
-#if 0 // defined(__WIN32__) && !defined(__WIN95__)
- // DClick not clean supported on Win3.1, except if someone know
- // how to emulate Sleep()...
- // This means that your app will receive Down-Up-Dclick sequences
- // rather than Dclick
- if (m_doubleClickAllowed)
- {
- UINT time = GetDoubleClickTime() ;
- Sleep(time) ;
- MSG dummy ;
- if (PeekMessage(&dummy,m_hWnd,
- WM_MBUTTONDBLCLK,WM_MBUTTONDBLCLK,
- PM_NOREMOVE)
- )
- {
- PeekMessage(&dummy,m_hWnd,WM_MBUTTONUP,WM_MBUTTONUP,PM_REMOVE);
- return;
- }
- }
-#endif
-
wxMouseEvent event(wxEVT_MIDDLE_DOWN);
event.m_x = x; event.m_y = y;
event.m_eventObject = this;
m_lastXPos = event.m_x; m_lastYPos = event.m_y; m_lastEvent = wxEVT_MIDDLE_DOWN;
- GetEventHandler()->OldOnMouseEvent(event);
+
+ if (!GetEventHandler()->ProcessEvent(event))
+ Default();
}
-void wxWindow::MSWOnMButtonUp(const int x, const int y, const WXUINT flags)
+void wxWindow::MSWOnMButtonUp(int x, int y, WXUINT flags)
{
//wxDebugMsg("MButtonUp\n") ;
wxMouseEvent event(wxEVT_MIDDLE_UP);
event.m_eventObject = this;
m_lastXPos = event.m_x; m_lastYPos = event.m_y; m_lastEvent = wxEVT_MIDDLE_UP;
- GetEventHandler()->OldOnMouseEvent(event);
+
+ if (!GetEventHandler()->ProcessEvent(event))
+ Default();
}
-void wxWindow::MSWOnMButtonDClick(const int x, const int y, const WXUINT flags)
+void wxWindow::MSWOnMButtonDClick(int x, int y, WXUINT flags)
{
wxMouseEvent event(wxEVT_MIDDLE_DCLICK);
event.m_eventObject = this;
m_lastXPos = event.m_x; m_lastYPos = event.m_y; m_lastEvent = wxEVT_MIDDLE_DCLICK;
-// if (m_doubleClickAllowed)
- GetEventHandler()->OldOnMouseEvent(event);
+
+ if (!GetEventHandler()->ProcessEvent(event))
+ Default();
}
-void wxWindow::MSWOnRButtonDown(const int x, const int y, const WXUINT flags)
+void wxWindow::MSWOnRButtonDown(int x, int y, WXUINT flags)
{
-#if 0 // defined(__WIN32__) && !defined(__WIN95__)
- // DClick not clean supported on Win3.1, except if someone know
- // how to emulate Sleep()...
- // This means that your app will receive Down-Up-Dclick sequences
- // rather than Dclick
- if (m_doubleClickAllowed)
- {
- UINT time = GetDoubleClickTime() ;
- Sleep(time) ;
- MSG dummy ;
- if (PeekMessage(&dummy,m_hWnd,
- WM_RBUTTONDBLCLK,WM_RBUTTONDBLCLK,
- PM_NOREMOVE)
- )
- {
- PeekMessage(&dummy,m_hWnd,WM_RBUTTONUP,WM_RBUTTONUP,PM_REMOVE);
- return;
- }
- }
-#endif
-
wxMouseEvent event(wxEVT_RIGHT_DOWN);
event.m_x = x; event.m_y = y;
event.m_eventObject = this;
m_lastXPos = event.m_x; m_lastYPos = event.m_y; m_lastEvent = wxEVT_RIGHT_DOWN;
- GetEventHandler()->OldOnMouseEvent(event);
+
+ if (!GetEventHandler()->ProcessEvent(event))
+ Default();
}
-void wxWindow::MSWOnRButtonUp(const int x, const int y, const WXUINT flags)
+void wxWindow::MSWOnRButtonUp(int x, int y, WXUINT flags)
{
wxMouseEvent event(wxEVT_RIGHT_UP);
event.SetTimestamp(wxApp::sm_lastMessageTime); /* MATTHEW: timeStamp */
m_lastXPos = event.m_x; m_lastYPos = event.m_y; m_lastEvent = wxEVT_RIGHT_UP;
- GetEventHandler()->OldOnMouseEvent(event);
+
+ if (!GetEventHandler()->ProcessEvent(event))
+ Default();
}
-void wxWindow::MSWOnRButtonDClick(const int x, const int y, const WXUINT flags)
+void wxWindow::MSWOnRButtonDClick(int x, int y, WXUINT flags)
{
wxMouseEvent event(wxEVT_RIGHT_DCLICK);
event.m_eventObject = this;
m_lastXPos = event.m_x; m_lastYPos = event.m_y; m_lastEvent = wxEVT_RIGHT_DCLICK;
-// if (m_doubleClickAllowed)
- GetEventHandler()->OldOnMouseEvent(event);
+
+ if (!GetEventHandler()->ProcessEvent(event))
+ Default();
}
-void wxWindow::MSWOnMouseMove(const int x, const int y, const WXUINT flags)
+void wxWindow::MSWOnMouseMove(int x, int y, WXUINT flags)
{
// 'normal' move event...
// Set cursor, but only if we're not in 'busy' mode
m_lastEvent = wxEVT_MOTION;
m_lastXPos = event.m_x; m_lastYPos = event.m_y;
- GetEventHandler()->OldOnMouseEvent(event);
+
+ if (!GetEventHandler()->ProcessEvent(event))
+ Default();
}
-void wxWindow::MSWOnMouseEnter(const int x, const int y, const WXUINT flags)
+void wxWindow::MSWOnMouseEnter(int x, int y, WXUINT flags)
{
wxMouseEvent event(wxEVT_ENTER_WINDOW);
GetEventHandler()->ProcessEvent(event);
}
-void wxWindow::MSWOnMouseLeave(const int x, const int y, const WXUINT flags)
+void wxWindow::MSWOnMouseLeave(int x, int y, WXUINT flags)
{
wxMouseEvent event(wxEVT_LEAVE_WINDOW);
GetEventHandler()->ProcessEvent(event);
}
-void wxWindow::MSWOnChar(const WXWORD wParam, const WXLPARAM lParam, const bool isASCII)
+void wxWindow::MSWOnChar(WXWORD wParam, WXLPARAM lParam, bool isASCII)
{
int id;
bool tempControlDown = FALSE;
event.m_x = pt.x; event.m_y = pt.y;
-#if WXWIN_COMPATIBILITY
- GetEventHandler()->OldOnChar(event);
-#else
if (!GetEventHandler()->ProcessEvent(event))
Default();
-#endif
}
}
-void wxWindow::MSWOnJoyDown(const int joystick, const int x, const int y, const WXUINT flags)
+void wxWindow::MSWOnJoyDown(int joystick, int x, int y, WXUINT flags)
{
int buttons = 0;
int change = 0;
GetEventHandler()->ProcessEvent(event);
}
-void wxWindow::MSWOnJoyUp(const int joystick, const int x, const int y, const WXUINT flags)
+void wxWindow::MSWOnJoyUp(int joystick, int x, int y, WXUINT flags)
{
int buttons = 0;
int change = 0;
GetEventHandler()->ProcessEvent(event);
}
-void wxWindow::MSWOnJoyMove(const int joystick, const int x, const int y, const WXUINT flags)
+void wxWindow::MSWOnJoyMove(int joystick, int x, int y, WXUINT flags)
{
int buttons = 0;
if (flags & JOY_BUTTON1)
GetEventHandler()->ProcessEvent(event);
}
-void wxWindow::MSWOnJoyZMove(const int joystick, const int z, const WXUINT flags)
+void wxWindow::MSWOnJoyZMove(int joystick, int z, WXUINT flags)
{
int buttons = 0;
if (flags & JOY_BUTTON1)
GetEventHandler()->ProcessEvent(event);
}
-void wxWindow::MSWOnVScroll(const WXWORD wParam, const WXWORD pos, const WXHWND control)
+void wxWindow::MSWOnVScroll(WXWORD wParam, WXWORD pos, WXHWND control)
{
if (control)
{
}
if (!GetEventHandler()->ProcessEvent(event))
-#if WXWIN_COMPATIBILITY
- GetEventHandler()->OldOnScroll(event);
-#else
Default();
-#endif
}
-void wxWindow::MSWOnHScroll( const WXWORD wParam, const WXWORD pos, const WXHWND control)
+void wxWindow::MSWOnHScroll( WXWORD wParam, WXWORD pos, WXHWND control)
{
if (control)
{
break;
}
if (!GetEventHandler()->ProcessEvent(event))
-#if WXWIN_COMPATIBILITY
- GetEventHandler()->OldOnScroll(event);
-#else
Default();
-#endif
}
void wxWindow::MSWOnShow(bool show, int status)
}
// Caret manipulation
-void wxWindow::CreateCaret(const int w, const int h)
+void wxWindow::CreateCaret(int w, int h)
{
m_caretWidth = w;
m_caretHeight = h;
// Not implemented
}
-void wxWindow::ShowCaret(const bool show)
+void wxWindow::ShowCaret(bool show)
{
if (m_caretEnabled)
{
m_caretEnabled = FALSE;
}
-void wxWindow::SetCaretPos(const int x, const int y)
+void wxWindow::SetCaretPos(int x, int y)
{
::SetCaretPos(x, y);
}
/* end Albert's fix for control and shift key 26.5 */
event.SetTimestamp(wxApp::sm_lastMessageTime); /* MATTHEW: timeStamp */
-#if WXWIN_COMPATIBILITY
- if ( wxTheApp && wxTheApp->OldOnCharHook(event) )
- return 1;
-#endif
wxWindow *win = wxGetActiveWindow();
if (win)
{
return (int)CallNextHookEx(wxTheKeyboardHook, nCode, wParam, lParam);
}
-void wxWindow::SetSizeHints(const int minW, const int minH, const int maxW, const int maxH, const int WXUNUSED(incW), const int WXUNUSED(incH))
+void wxWindow::SetSizeHints(int minW, int minH, int maxW, int maxH, int WXUNUSED(incW), int WXUNUSED(incH))
{
m_minSizeX = minW;
m_minSizeY = minH;
m_maxSizeY = maxH;
}
-void wxWindow::Centre(const int direction)
+void wxWindow::Centre(int direction)
{
int x, y, width, height, panel_width, panel_height, new_x, new_y;
}
*/
-void wxWindow::WarpPointer (const int x_pos, const int y_pos)
+void wxWindow::WarpPointer (int x_pos, int y_pos)
{
// Move the pointer to (x_pos,y_pos) coordinates. They are expressed in
// pixel coordinates, relatives to the canvas -- So, we first need to
*/
}
-bool wxWindow::MSWOnEraseBkgnd (const WXHDC pDC)
+bool wxWindow::MSWOnEraseBkgnd (WXHDC pDC)
{
wxDC dc ;
}
#if WXWIN_COMPATIBILITY
-void wxWindow::SetScrollRange(const int orient, const int range, const bool refresh)
+void wxWindow::SetScrollRange(int orient, int range, bool refresh)
{
#if defined(__WIN95__)
#endif
}
-void wxWindow::SetScrollPage(const int orient, const int page, const bool refresh)
+void wxWindow::SetScrollPage(int orient, int page, bool refresh)
{
#if defined(__WIN95__)
SCROLLINFO info;
#endif
}
-int wxWindow::OldGetScrollRange(const int orient) const
+int wxWindow::OldGetScrollRange(int orient) const
{
int wOrient ;
if (orient == wxHORIZONTAL)
return 0;
}
-int wxWindow::GetScrollPage(const int orient) const
+int wxWindow::GetScrollPage(int orient) const
{
if (orient == wxHORIZONTAL)
return m_xThumbSize;
}
#endif
-int wxWindow::GetScrollPos(const int orient) const
+int wxWindow::GetScrollPos(int orient) const
{
int wOrient ;
if (orient == wxHORIZONTAL)
// This now returns the whole range, not just the number
// of positions that we can scroll.
-int wxWindow::GetScrollRange(const int orient) const
+int wxWindow::GetScrollRange(int orient) const
{
int wOrient ;
if (orient == wxHORIZONTAL)
return 0;
}
-int wxWindow::GetScrollThumb(const int orient) const
+int wxWindow::GetScrollThumb(int orient) const
{
if (orient == wxHORIZONTAL)
return m_xThumbSize;
return m_yThumbSize;
}
-void wxWindow::SetScrollPos(const int orient, const int pos, const bool refresh)
+void wxWindow::SetScrollPos(int orient, int pos, bool refresh)
{
#if defined(__WIN95__)
SCROLLINFO info;
}
// New function that will replace some of the above.
-void wxWindow::SetScrollbar(const int orient, const int pos, const int thumbVisible,
- const int range, const bool refresh)
+void wxWindow::SetScrollbar(int orient, int pos, int thumbVisible,
+ int range, bool refresh)
{
/*
SetScrollPage(orient, thumbVisible, FALSE);
}
}
-void wxWindow::ScrollWindow(const int dx, const int dy, const wxRectangle *rect)
+void wxWindow::ScrollWindow(int dx, int dy, const wxRectangle *rect)
{
RECT rect2;
if ( rect )
}
/*
-void wxWindow::CalcScrolledPosition(const int x, const int y, int *xx, int *yy) const
+void wxWindow::CalcScrolledPosition(int x, int y, int *xx, int *yy) const
{
*xx = x;
*yy = y;
}
-void wxWindow::CalcUnscrolledPosition(const int x, const int y, float *xx, float *yy) const
+void wxWindow::CalcUnscrolledPosition(int x, int y, float *xx, float *yy) const
{
*xx = x;
*yy = y;
return exStyle;
}
+/*
#if WXWIN_COMPATIBILITY
void wxWindow::OldOnPaint(void)
{
Default();
};
#endif
+*/
void wxWindow::OnChar(wxKeyEvent& event)
{
}
}
-void wxWindow::MakeModal(const bool modal)
+void wxWindow::MakeModal(bool modal)
{
// Disable all other windows
if (this->IsKindOf(CLASSINFO(wxDialog)) || this->IsKindOf(CLASSINFO(wxFrame)))
}
// Do a phase of evaluating child constraints
-bool wxWindow::DoPhase(const int phase)
+bool wxWindow::DoPhase(int phase)
{
int noIterations = 0;
int maxIterations = 500;
// Need to distinguish between setting the 'fake' size for
// windows and sizers, and setting the real values.
-void wxWindow::SetConstraintSizes(const bool recurse)
+void wxWindow::SetConstraintSizes(bool recurse)
{
wxLayoutConstraints *constr = GetConstraints();
if (constr && constr->left.GetDone() && constr->right.GetDone() &&
*y += yp;
}
-void wxWindow::SizerSetSize(const int x, const int y, const int w, const int h)
+void wxWindow::SizerSetSize(int x, int y, int w, int h)
{
int xx = x;
int yy = y;
SetSize(xx, yy, w, h);
}
-void wxWindow::SizerMove(const int x, const int y)
+void wxWindow::SizerMove(int x, int y)
{
int xx = x;
int yy = y;
}
// Only set the size/position of the constraint (if any)
-void wxWindow::SetSizeConstraint(const int x, const int y, const int w, const int h)
+void wxWindow::SetSizeConstraint(int x, int y, int w, int h)
{
wxLayoutConstraints *constr = GetConstraints();
if (constr)
}
}
-void wxWindow::MoveConstraint(const int x, const int y)
+void wxWindow::MoveConstraint(int x, int y)
{
wxLayoutConstraints *constr = GetConstraints();
if (constr)
GetPosition(x, y);
}
-bool wxWindow::Close(const bool force)
+bool wxWindow::Close(bool force)
{
// Let's generalise it to work the same for any window.
/*
*/
}
-wxObject* wxWindow::GetChild(const int number) const
+wxObject* wxWindow::GetChild(int number) const
{
// Return a pointer to the Nth object in the Panel
if (!GetChildren())
void wxWindow::OnDefaultAction(wxControl *initiatingItem)
{
- if (initiatingItem->IsKindOf(CLASSINFO(wxListBox)) && initiatingItem->GetCallback())
+/* This is obsolete now; if we wish to intercept listbox double-clicks,
+ * we explicitly intercept the wxEVT_COMMAND_LISTBOX_DOUBLECLICKED
+ * event.
+
+ if (initiatingItem->IsKindOf(CLASSINFO(wxListBox)))
{
wxListBox *lbox = (wxListBox *)initiatingItem;
wxCommandEvent event(wxEVT_COMMAND_LEFT_DCLICK);
if (but)
{
wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED);
+ event.SetEventObject(but);
but->Command(event);
}
+*/
}
void wxWindow::Clear(void)
}
// Find a window by id or name
-wxWindow *wxWindow::FindWindow(const long id)
+wxWindow *wxWindow::FindWindow(long id)
{
if ( GetId() == id)
return this;
projects / wxWidgets.git / commitdiff
