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

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

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

18
src/gtk1/bitmap.cpp
View File

@@ -34,7 +34,7 @@ wxMask::wxMask( const wxBitmap& WXUNUSED(bitmap), const wxColour& WXUNUSED(colou
{
};
wxMask::wxMask( const wxBitmap& WXUNUSED(bitmap), const int WXUNUSED(paletteIndex) )
wxMask::wxMask( const wxBitmap& WXUNUSED(bitmap), int WXUNUSED(paletteIndex) )
{
};
@@ -111,7 +111,7 @@ wxBitmap::wxBitmap(void)
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;
@@ -163,13 +163,13 @@ wxBitmap::wxBitmap( const wxBitmap* bmp )
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();
@@ -227,19 +227,19 @@ int wxBitmap::GetDepth(void) const
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;
@@ -258,13 +258,13 @@ void wxBitmap::SetMask( wxMask *mask )
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

4
src/gtk1/bmpbuttn.cpp
View File

@@ -42,14 +42,14 @@ wxBitmapButton::wxBitmapButton(void)
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;

4
src/gtk1/brush.cpp
View File

@@ -45,7 +45,7 @@ wxBrush::wxBrush(void)
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;
@@ -54,7 +54,7 @@ wxBrush::wxBrush( const wxColour &colour, const int 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;

4
src/gtk1/button.cpp
View File

@@ -42,14 +42,14 @@ wxButton::wxButton(void)
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;

6
src/gtk1/checkbox.cpp
View File

@@ -38,14 +38,14 @@ wxCheckBox::wxCheckBox(void)
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;
@@ -68,7 +68,7 @@ bool wxCheckBox::Create( wxWindow *parent, wxWindowID id, const wxString &label
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 );

22
src/gtk1/choice.cpp
View File

@@ -38,18 +38,18 @@ wxChoice::wxChoice(void)
{
};
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;
@@ -141,7 +141,7 @@ int wxChoice::GetSelection(void)
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;
@@ -180,11 +180,11 @@ int wxChoice::Number(void) const
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 );

26
src/gtk1/combobox.cpp
View File

@@ -32,10 +32,10 @@ void gtk_combo_clicked_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo
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;
@@ -97,7 +97,7 @@ void wxComboBox::Append( const wxString &WXUNUSED(item), char* WXUNUSED(clientDa
{
};
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 );
@@ -120,14 +120,14 @@ int wxComboBox::FindString( const wxString &item )
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 );
@@ -152,7 +152,7 @@ int wxComboBox::GetSelection(void) const
return -1;
};
wxString wxComboBox::GetString( const int n ) const
wxString wxComboBox::GetString( int n ) const
{
GtkWidget *list = GTK_COMBO(m_widget)->list;
@@ -190,7 +190,7 @@ int wxComboBox::Number(void) const
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 );
@@ -229,7 +229,7 @@ void wxComboBox::Paste(void)
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;
@@ -256,7 +256,7 @@ long wxComboBox::GetLastPosition(void) const
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 );
@@ -265,17 +265,17 @@ void wxComboBox::Replace( const long from, const long to, const wxString& value
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) )
{
};

2
src/gtk1/control.cpp
View File

@@ -28,7 +28,7 @@ wxControl::wxControl(void)
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 )
{
};

2
src/gtk1/cursor.cpp
View File

@@ -49,7 +49,7 @@ wxCursor::wxCursor(void)
{
};
wxCursor::wxCursor( const int cursorId )
wxCursor::wxCursor( int cursorId )
{
m_refData = new wxCursorRefData();

6
src/gtk1/dialog.cpp
View File

@@ -57,7 +57,7 @@ wxDialog::wxDialog(void)
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 );
@@ -66,7 +66,7 @@ wxDialog::wxDialog( wxWindow *parent,
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;
@@ -172,7 +172,7 @@ void wxDialog::OnCloseWindow(wxCloseEvent& event)
};
};
bool wxDialog::Show( const bool show )
bool wxDialog::Show( bool show )
{
if (!show && m_modalShowing)
{

2
src/gtk1/dnd.cpp
View File

@@ -106,7 +106,7 @@ wxDragSource::~wxDragSource(void)
g_blockEventsOnDrag = FALSE;
};
void wxDragSource::SetData( char *data, const long size )
void wxDragSource::SetData( char *data, long size )
{
m_size = size;
m_data = data;

20
src/gtk1/frame.cpp
View File

@@ -80,18 +80,18 @@ wxFrame::wxFrame(void)
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;
@@ -154,7 +154,7 @@ wxFrame::~wxFrame(void)
if (wxTopLevelWindows.Number() == 0) wxTheApp->ExitMainLoop();
};
bool wxFrame::Show( const bool show )
bool wxFrame::Show( bool show )
{
if (show)
{
@@ -165,7 +165,7 @@ bool wxFrame::Show( const bool 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 );
@@ -309,7 +309,7 @@ void wxFrame::SetMenuBar( wxMenuBar *menuBar )
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;
@@ -320,12 +320,12 @@ bool wxFrame::CreateStatusBar( const int number )
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 );
};

8
src/gtk1/gauge.cpp
View File

@@ -20,9 +20,9 @@
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;
@@ -43,7 +43,7 @@ bool wxGauge::Create( wxWindow *parent, const wxWindowID id, const int range,
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;
@@ -51,7 +51,7 @@ void wxGauge::SetRange( const int r )
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;

22
src/gtk1/listbox.cpp
View File

@@ -49,16 +49,16 @@ wxListBox::wxListBox(void)
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;
@@ -150,7 +150,7 @@ int wxListBox::FindString( const wxString &item ) const
return -1;
};
char *wxListBox::GetClientData( const int WXUNUSED(n) ) const
char *wxListBox::GetClientData( int WXUNUSED(n) ) const
{
wxFAIL_MSG("wxListBox::GetClientData not implemented");
@@ -231,7 +231,7 @@ int wxListBox::Number(void)
return count;
};
bool wxListBox::Selected( const int n )
bool wxListBox::Selected( int n )
{
GList *target = g_list_nth( m_list->children, n );
if (target)
@@ -246,11 +246,11 @@ bool wxListBox::Selected( const int n )
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) )
{
};
@@ -262,7 +262,7 @@ void wxListBox::SetFirstItem( const wxString &WXUNUSED(item) )
{
};
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 );
@@ -270,11 +270,11 @@ void wxListBox::SetSelection( const int n, const bool select )
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 );
};

20
src/gtk1/mdi.cpp
View File

@@ -28,9 +28,9 @@ wxMDIParentFrame::wxMDIParentFrame(void)
};
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;
@@ -43,9 +43,9 @@ wxMDIParentFrame::~wxMDIParentFrame(void)
};
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 );
@@ -112,9 +112,9 @@ wxMDIChildFrame::wxMDIChildFrame(void)
};
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 );
};
@@ -124,9 +124,9 @@ wxMDIChildFrame::~wxMDIChildFrame(void)
};
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 );
@@ -150,7 +150,7 @@ wxMDIClientWindow::wxMDIClientWindow(void)
{
};
wxMDIClientWindow::wxMDIClientWindow( wxMDIParentFrame *parent, const long style )
wxMDIClientWindow::wxMDIClientWindow( wxMDIParentFrame *parent, long style )
{
CreateClient( parent, style );
};
@@ -159,7 +159,7 @@ wxMDIClientWindow::~wxMDIClientWindow(void)
{
};
bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, const long style )
bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style )
{
m_needParent = TRUE;

10
src/gtk1/menu.cpp
View File

@@ -148,7 +148,7 @@ void wxMenu::AppendSeparator(void)
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;
@@ -176,7 +176,7 @@ void wxMenu::Append( const int id, const wxString &item, const wxString &helpStr
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;
@@ -219,7 +219,7 @@ int wxMenu::FindItem( const wxString itemString ) const
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)
@@ -234,7 +234,7 @@ void wxMenu::Enable( const int id, const bool enable )
};
};
bool wxMenu::Enabled( const int id ) const
bool wxMenu::Enabled( int id ) const
{
wxNode *node = m_items.First();
while (node)
@@ -246,7 +246,7 @@ bool wxMenu::Enabled( const int id ) const
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;

10
src/gtk1/notebook.cpp
View File

@@ -89,9 +89,9 @@ wxNotebook::wxNotebook()
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 );
@@ -108,9 +108,9 @@ wxNotebook::~wxNotebook()
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;
@@ -253,7 +253,7 @@ bool wxNotebook::SetPageText( int page, const wxString &text )
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)

6
src/gtk1/palette.cpp
View File

@@ -49,7 +49,7 @@ wxPalette::wxPalette(void)
{
};
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 );
@@ -92,7 +92,7 @@ bool wxPalette::Ok(void) const
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)
{
};
@@ -100,7 +100,7 @@ int wxPalette::GetPixel( const unsigned char red, const unsigned char green, con
{
};
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
{
};

2
src/gtk1/pen.cpp
View File

@@ -120,7 +120,7 @@ void wxPen::SetColour( const wxString &colourName )
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();

36
src/gtk1/radiobox.cpp
View File

@@ -41,19 +41,19 @@ wxRadioBox::wxRadioBox(void)
{
};
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;
@@ -108,7 +108,7 @@ bool wxRadioBox::Create( wxWindow *parent, const wxWindowID id, const wxString&
return TRUE;
};
bool wxRadioBox::Show( const bool show )
bool wxRadioBox::Show( bool show )
{
wxWindow::Show( show );
@@ -128,7 +128,7 @@ int wxRadioBox::FindString( const wxString& WXUNUSED(s) ) const
return 0;
};
void wxRadioBox::SetSelection( const int WXUNUSED(n) )
void wxRadioBox::SetSelection( int WXUNUSED(n) )
{
};
@@ -146,7 +146,7 @@ int wxRadioBox::GetSelection(void) const
return -1;
};
wxString wxRadioBox::GetString( const int WXUNUSED(n) ) const
wxString wxRadioBox::GetString( int WXUNUSED(n) ) const
{
return "";
};
@@ -160,28 +160,28 @@ void wxRadioBox::SetLabel( const wxString& WXUNUSED(label) )
{
};
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) )
{
};
@@ -223,7 +223,7 @@ int wxRadioBox::GetNumberOfRowsOrCols(void) const
return 1;
};
void wxRadioBox::SetNumberOfRowsOrCols( const int WXUNUSED(n) )
void wxRadioBox::SetNumberOfRowsOrCols( int WXUNUSED(n) )
{
};

22
src/gtk1/scrolbar.cpp
View File

@@ -63,9 +63,9 @@ void gtk_scrollbar_callback( GtkWidget *WXUNUSED(widget), wxScrollBar *win )
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 );
};
@@ -74,9 +74,9 @@ wxScrollBar::~wxScrollBar(void)
{
};
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;
@@ -121,7 +121,7 @@ int wxScrollBar::GetRange() const
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;
@@ -131,8 +131,8 @@ void wxScrollBar::SetPosition( const int viewStart )
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;
@@ -162,7 +162,7 @@ int wxScrollBar::GetValue(void) const
return GetPosition();
};
void wxScrollBar::SetValue( const int viewStart )
void wxScrollBar::SetValue( int viewStart )
{
SetPosition( viewStart );
};
@@ -190,7 +190,7 @@ int wxScrollBar::GetObjectLength() const
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);
@@ -198,7 +198,7 @@ void wxScrollBar::SetPageSize( const int pageLength )
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);
@@ -206,7 +206,7 @@ void wxScrollBar::SetObjectLength( const int objectLength )
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);

30
src/gtk1/slider.cpp
View File

@@ -65,10 +65,10 @@ wxSlider::wxSlider(void)
{
};
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 )
{
@@ -80,10 +80,10 @@ wxSlider::~wxSlider(void)
{
};
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 )
{
@@ -117,7 +117,7 @@ int wxSlider::GetValue(void) const
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;
@@ -127,7 +127,7 @@ void wxSlider::SetValue( const int value )
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;
@@ -152,7 +152,7 @@ int wxSlider::GetMax(void) const
return (int)(m_adjust->upper+0.5);
};
void wxSlider::SetPageSize( const int pageSize )
void wxSlider::SetPageSize( int pageSize )
{
float fpage = (float)pageSize;
@@ -168,7 +168,7 @@ int wxSlider::GetPageSize(void) const
return (int)(m_adjust->page_increment+0.5);
};
void wxSlider::SetThumbLength( const int len )
void wxSlider::SetThumbLength( int len )
{
float flen = (float)len;
@@ -184,7 +184,7 @@ int wxSlider::GetThumbLength(void) const
return (int)(m_adjust->page_size+0.5);
};
void wxSlider::SetLineSize( const int WXUNUSED(lineSize) )
void wxSlider::SetLineSize( int WXUNUSED(lineSize) )
{
};
@@ -200,7 +200,7 @@ void wxSlider::GetSize( int *x, int *y ) const
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 );
};
@@ -210,11 +210,11 @@ void wxSlider::GetPosition( int *x, int *y ) const
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) )
{
};
@@ -227,7 +227,7 @@ void wxSlider::ClearTicks(void)
{
};
void wxSlider::SetSelection( const int WXUNUSED(minPos), const int WXUNUSED(maxPos) )
void wxSlider::SetSelection( int WXUNUSED(minPos), int WXUNUSED(maxPos) )
{
};

4
src/gtk1/statbmp.cpp
View File

@@ -26,14 +26,14 @@ wxStaticBitmap::wxStaticBitmap(void)
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;

4
src/gtk1/statbox.cpp
View File

@@ -26,14 +26,14 @@ wxStaticBox::wxStaticBox(void)
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;

4
src/gtk1/stattext.cpp
View File

@@ -27,14 +27,14 @@ wxStaticText::wxStaticText(void)
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;

38
src/gtk1/tbargtk.cpp
View File

@@ -21,9 +21,9 @@
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;
@@ -68,9 +68,9 @@ wxToolBarGTK::wxToolBarGTK(void)
{
};
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 );
};
@@ -79,9 +79,9 @@ wxToolBarGTK::~wxToolBarGTK(void)
{
};
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;
@@ -131,9 +131,9 @@ void wxToolBarGTK::OnMouseEnter( int toolIndex )
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;
@@ -169,39 +169,39 @@ void wxToolBarGTK::ClearTools(void)
{
};
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)
{
};

34
src/gtk1/textctrl.cpp
View File

@@ -36,17 +36,17 @@ wxTextCtrl::wxTextCtrl(void) : streambuf()
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;
@@ -160,7 +160,7 @@ void wxTextCtrl::DiscardEdits(void)
};
/*
wxString wxTextCtrl::GetLineText( const long lineNo ) const
wxString wxTextCtrl::GetLineText( long lineNo ) const
{
};
@@ -169,11 +169,11 @@ void wxTextCtrl::OnDropFiles( wxDropFilesEvent &event )
{
};
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 )
{
};
@@ -182,7 +182,7 @@ int wxTextCtrl::GetNumberOfLines(void)
};
*/
void wxTextCtrl::SetInsertionPoint( const long pos )
void wxTextCtrl::SetInsertionPoint( long pos )
{
int tmp = (int) pos;
if (m_windowStyle & wxTE_MULTILINE)
@@ -201,7 +201,7 @@ void wxTextCtrl::SetInsertionPointEnd(void)
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 );
@@ -209,12 +209,12 @@ void wxTextCtrl::SetEditable( const bool 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");
};
@@ -234,12 +234,12 @@ long wxTextCtrl::GetLastPosition(void) const
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;
@@ -378,7 +378,7 @@ wxTextCtrl& wxTextCtrl::operator<<(const wxString& s)
return *this;
}
wxTextCtrl& wxTextCtrl::operator<<(const float f)
wxTextCtrl& wxTextCtrl::operator<<(float f)
{
static char buf[100];
sprintf(buf, "%.2f", f);
@@ -386,7 +386,7 @@ wxTextCtrl& wxTextCtrl::operator<<(const float f)
return *this;
}
wxTextCtrl& wxTextCtrl::operator<<(const double d)
wxTextCtrl& wxTextCtrl::operator<<(double d)
{
static char buf[100];
sprintf(buf, "%.2f", d);
@@ -394,7 +394,7 @@ wxTextCtrl& wxTextCtrl::operator<<(const double d)
return *this;
}
wxTextCtrl& wxTextCtrl::operator<<(const int i)
wxTextCtrl& wxTextCtrl::operator<<(int i)
{
static char buf[100];
sprintf(buf, "%i", i);
@@ -402,7 +402,7 @@ wxTextCtrl& wxTextCtrl::operator<<(const int i)
return *this;
}
wxTextCtrl& wxTextCtrl::operator<<(const long i)
wxTextCtrl& wxTextCtrl::operator<<(long i)
{
static char buf[100];
sprintf(buf, "%ld", i);

72
src/gtk1/window.cpp
View File

@@ -724,16 +724,16 @@ wxWindow::wxWindow()
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;
@@ -869,9 +869,9 @@ wxWindow::~wxWindow(void)
};
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 );
@@ -997,7 +997,7 @@ bool wxWindow::HasVMT(void)
return m_hasVMT;
};
bool wxWindow::Close( const bool force )
bool wxWindow::Close( bool force )
{
wxCloseEvent event(wxEVT_CLOSE_WINDOW, m_windowId);
event.SetEventObject(this);
@@ -1049,7 +1049,7 @@ void wxWindow::ImplementSetPosition(void)
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;
@@ -1093,12 +1093,12 @@ void wxWindow::SetSize( const int x, const int y, const int width, const int hei
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 );
};
@@ -1109,7 +1109,7 @@ void wxWindow::GetSize( int *width, int *height ) const
(*height) = m_height;
};
void wxWindow::SetClientSize( const int width, const int height )
void wxWindow::SetClientSize( int width, int height )
{
if (!m_wxwindow)
{
@@ -1287,7 +1287,7 @@ void wxWindow::ScreenToClient( int *x, int *y )
if (y) *y -= org_y;
};
void wxWindow::Centre( const int direction )
void wxWindow::Centre( int direction )
{
int x = 0;
int y = 0;
@@ -1338,7 +1338,7 @@ void wxWindow::OnSize( wxSizeEvent &WXUNUSED(event) )
if (GetAutoLayout()) Layout();
};
bool wxWindow::Show( const bool show )
bool wxWindow::Show( bool show )
{
if (show)
gtk_widget_show( m_widget );
@@ -1348,14 +1348,14 @@ bool wxWindow::Show( const bool show )
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
@@ -1508,7 +1508,7 @@ void wxWindow::SetCursor( const wxCursor &cursor )
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)
{
@@ -1557,12 +1557,12 @@ void wxWindow::Refresh( const bool eraseBackground, const wxRect *rect )
};
};
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 );
};
@@ -1749,7 +1749,7 @@ bool wxWindow::IsRetained(void)
return FALSE;
};
wxWindow *wxWindow::FindWindow( const long id )
wxWindow *wxWindow::FindWindow( long id )
{
if (id == m_windowId) return this;
wxNode *node = m_children.First();
@@ -1777,8 +1777,8 @@ wxWindow *wxWindow::FindWindow( const wxString& name )
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;
@@ -1832,7 +1832,7 @@ void wxWindow::SetScrollbar( const int orient, const int pos, const int thumbVis
};
};
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;
@@ -1861,7 +1861,7 @@ void wxWindow::SetScrollPos( const int orient, const int pos, const bool WXUNUSE
};
};
int wxWindow::GetScrollThumb( const int orient ) const
int wxWindow::GetScrollThumb( int orient ) const
{
if (!m_wxwindow) return 0;
@@ -1871,7 +1871,7 @@ int wxWindow::GetScrollThumb( const int orient ) const
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;
@@ -1881,7 +1881,7 @@ int wxWindow::GetScrollPos( const int orient ) const
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;
@@ -1891,7 +1891,7 @@ int wxWindow::GetScrollRange( const int orient ) const
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;
@@ -1985,7 +1985,7 @@ void wxWindow::SetConstraints( wxLayoutConstraints *constraints )
}
;
void wxWindow::SetAutoLayout( const bool autoLayout )
void wxWindow::SetAutoLayout( bool autoLayout )
{
m_autoLayout = autoLayout;
};
@@ -2153,7 +2153,7 @@ bool wxWindow::LayoutPhase2(int *noChanges)
}
// Do a phase of evaluating child constraints
bool wxWindow::DoPhase(const int phase)
bool wxWindow::DoPhase(int phase)
{
int noIterations = 0;
int maxIterations = 500;
@@ -2221,7 +2221,7 @@ void wxWindow::ResetConstraints(void)
// 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() &&
@@ -2294,7 +2294,7 @@ void wxWindow::TransformSizerToActual(int *x, int *y) const
*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;
@@ -2302,7 +2302,7 @@ void wxWindow::SizerSetSize(const int x, const int y, const int w, const int h)
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;
@@ -2311,7 +2311,7 @@ void wxWindow::SizerMove(const int x, const int 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)
@@ -2339,7 +2339,7 @@ void wxWindow::SetSizeConstraint(const int x, const int y, const int w, const in
}
}
void wxWindow::MoveConstraint(const int x, const int y)
void wxWindow::MoveConstraint(int x, int y)
{
wxLayoutConstraints *constr = GetConstraints();
if (constr)