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

24
src/common/date.cpp
View File

@@ -71,14 +71,14 @@ wxDate::wxDate()
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';
@@ -164,25 +164,25 @@ wxDate::operator wxString( void )
// 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;
@@ -193,14 +193,14 @@ long wxDate::operator - (const wxDate &dt)
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();
@@ -333,7 +333,7 @@ void wxDate::mdy_to_julian (void)
// Format routine
////////////////////////////////////////////////////////////////
wxString wxDate::FormatDate (const int type) const
wxString wxDate::FormatDate (int type) const
{
int actualType = type;
if (actualType == -1)
@@ -407,12 +407,12 @@ wxString wxDate::FormatDate (const int type) const
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 )
{
@@ -623,7 +623,7 @@ bool wxDate::IsBetween(const wxDate& first, const wxDate& second) const
}
// 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;

4
src/common/datstrm.cpp
View File

@@ -190,8 +190,8 @@ void wxDataStream::WriteString(const wxString& string)
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

50
src/common/docview.cpp
View File

@@ -1308,7 +1308,7 @@ BEGIN_EVENT_TABLE(wxDocChildFrame, wxFrame)
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;
@@ -1339,18 +1339,6 @@ bool wxDocChildFrame::ProcessEvent(wxEvent& event)
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);
@@ -1389,7 +1377,7 @@ BEGIN_EVENT_TABLE(wxDocParentFrame, wxFrame)
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;
@@ -1417,40 +1405,6 @@ bool wxDocParentFrame::ProcessEvent(wxEvent& event)
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)

6
src/common/event.cpp
View File

@@ -378,8 +378,8 @@ bool wxEvtHandler::SearchEventTable(wxEventTable& table, wxEvent& event)
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 )
{
@@ -432,6 +432,7 @@ bool wxEvtHandler::SearchDynamicEventTable( wxEvent& event )
return FALSE;
};
/*
#if WXWIN_COMPATIBILITY
void wxEvtHandler::OldOnMenuCommand(int cmd)
{
@@ -510,6 +511,7 @@ void wxEvtHandler::OldOnDropFiles(int n, char *files[], int x, int y)
if (GetNextHandler()) GetNextHandler()->OldOnDropFiles(n, files, x, y);
}
#endif
*/
bool wxEvtHandler::OnClose(void)
{

12
src/common/gdicmn.cpp
View File

@@ -51,7 +51,7 @@ wxRect::wxRect(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;
}
@@ -454,7 +454,7 @@ void wxPenList::RemovePen (wxPen * pen)
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 ())
{
@@ -477,7 +477,7 @@ wxPen *wxPenList::FindOrCreatePen (const wxColour& colour, const int width, cons
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)
@@ -503,7 +503,7 @@ void wxBrushList::AddBrush (wxBrush * brush)
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 ())
{
@@ -524,7 +524,7 @@ wxBrush *wxBrushList::FindOrCreateBrush (const wxColour& colour, const int style
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)
@@ -573,7 +573,7 @@ void wxFontList::RemoveFont (wxFont * font)
}
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 ())
{

24
src/common/hash.cpp
View File

@@ -33,7 +33,7 @@
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;
@@ -55,7 +55,7 @@ wxHashTable::~wxHashTable (void)
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;
@@ -71,7 +71,7 @@ bool wxHashTable::Create(const int the_key_type, const int size)
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;
@@ -85,7 +85,7 @@ void wxHashTable::Put (const long key, const long value, wxObject * object)
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;
@@ -99,7 +99,7 @@ void wxHashTable::Put (const long key, const char *value, wxObject * object)
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;
@@ -123,7 +123,7 @@ void wxHashTable::Put (const char *key, wxObject * object)
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;
@@ -143,7 +143,7 @@ wxObject *wxHashTable::Get (const long key, const long value) const
}
}
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;
@@ -163,7 +163,7 @@ wxObject *wxHashTable::Get (const long key, const char *value) const
}
}
wxObject *wxHashTable::Get (const long key) const
wxObject *wxHashTable::Get (long key) const
{
// Should NEVER be
long k = (long) key;
@@ -193,7 +193,7 @@ wxObject *wxHashTable::Get (const char *key) const
}
}
wxObject *wxHashTable::Delete (const long key)
wxObject *wxHashTable::Delete (long key)
{
// Should NEVER be
long k = (long) key;
@@ -236,7 +236,7 @@ wxObject *wxHashTable::Delete (const char *key)
}
}
wxObject *wxHashTable::Delete (const long key, const int value)
wxObject *wxHashTable::Delete (long key, int value)
{
// Should NEVER be
long k = (long) key;
@@ -260,7 +260,7 @@ wxObject *wxHashTable::Delete (const long key, const int value)
}
}
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])
@@ -328,7 +328,7 @@ wxNode *wxHashTable::Next (void)
return found;
}
void wxHashTable::DeleteContents (const bool flag)
void wxHashTable::DeleteContents (bool flag)
{
int i;
for (i = 0; i < n; i++)

6
src/common/layout.cpp
View File

@@ -1273,7 +1273,7 @@ void wxSizer::RemoveSizerChild(wxWindow *child)
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)
@@ -1302,7 +1302,7 @@ void wxSizer::SetSize(const int x, const int y, const int w, const int h, const
}
}
void wxSizer::Move(const int x, const int y)
void wxSizer::Move(int x, int y)
{
wxLayoutConstraints *constr = GetConstraints();
if (x != -1)
@@ -1517,7 +1517,7 @@ wxRowColSizer::~wxRowColSizer(void)
{
}
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);
}

10
src/common/list.cpp
View File

@@ -132,7 +132,7 @@ wxList::wxList (void)
key_type = wxKEY_NONE;
}
wxList::wxList (const int N, wxObject * Objects[])
wxList::wxList (int N, wxObject * Objects[])
{
wxNode *last = NULL;
@@ -254,7 +254,7 @@ wxNode *wxList::Append(wxObject *object)
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 ())
@@ -266,7 +266,7 @@ wxNode *wxList::Nth (const int i) const
}
wxNode *wxList::Find (const long key) const
wxNode *wxList::Find (long key) const
{
wxNode *current = First();
while (current)
@@ -370,7 +370,7 @@ wxNode *wxList::Insert (wxNode * position, wxObject * object)
}
// 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)
@@ -582,7 +582,7 @@ void wxStringList::Delete (const char *s)
}
// 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 ();

2
src/common/postscrp.cpp
View File

@@ -2037,7 +2037,7 @@ void wxPostScriptDC::CalcBoundingBox(long x, long y)
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();

2
src/common/resource.cpp
View File

@@ -561,7 +561,7 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, wxItemResource *childRe
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,

54
src/common/tbarbase.cpp
View File

@@ -48,9 +48,9 @@ END_EVENT_TABLE()
// 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;
@@ -158,8 +158,8 @@ void wxToolBarBase::OnMouseEnter ( int toolIndex )
// 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);
@@ -207,7 +207,7 @@ void wxToolBarBase::ClearTools(void)
}
}
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)
@@ -218,11 +218,11 @@ void wxToolBarBase::EnableTool(const int index, const bool enable)
}
}
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){
@@ -231,7 +231,7 @@ void wxToolBarBase::SetToggle(const int index, const bool value)
}
}
bool wxToolBarBase::GetToolState(const int index) const
bool wxToolBarBase::GetToolState(int index) const
{
wxNode *node = m_tools.Find((long)index);
if (node)
@@ -246,7 +246,7 @@ bool wxToolBarBase::GetToolState(const int index) const
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)
@@ -261,7 +261,7 @@ bool wxToolBarBase::GetToolEnabled(const int index) const
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)
@@ -276,7 +276,7 @@ wxObject *wxToolBarBase::GetToolClientData(const int index) const
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)
@@ -286,7 +286,7 @@ void wxToolBarBase::SetToolShortHelp(const int index, const wxString& helpString
}
}
wxString wxToolBarBase::GetToolShortHelp(const int index) const
wxString wxToolBarBase::GetToolShortHelp(int index) const
{
wxNode *node=m_tools.Find((long)index);
if (node)
@@ -298,7 +298,7 @@ wxString wxToolBarBase::GetToolShortHelp(const int index) const
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)
@@ -308,7 +308,7 @@ void wxToolBarBase::SetToolLongHelp(const int index, const wxString& helpString)
}
}
wxString wxToolBarBase::GetToolLongHelp(const int index) const
wxString wxToolBarBase::GetToolLongHelp(int index) const
{
wxNode *node=m_tools.Find((long)index);
if (node)
@@ -320,7 +320,7 @@ wxString wxToolBarBase::GetToolLongHelp(const int index) const
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)
@@ -345,18 +345,18 @@ wxSize wxToolBarBase::GetMaxSize ( void ) const
// 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;
}
@@ -464,9 +464,9 @@ void wxToolBarBase::Layout(void)
* 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;
@@ -737,7 +737,7 @@ void wxToolBarBase::SetScrollPageSize(int orient, int pageSize)
/*
* 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);
@@ -760,7 +760,7 @@ void wxToolBarBase::Scroll (const int x_pos, const int y_pos)
#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;
@@ -780,13 +780,13 @@ void wxToolBarBase::ViewStart (int *x, int *y) const
}
/*
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);
@@ -829,7 +829,7 @@ void wxToolBarBase::DoToolbarUpdates(void)
#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);
}

8
src/common/tbarsmpl.cpp
View File

@@ -49,8 +49,8 @@ wxToolBarSimple::wxToolBarSimple(void)
{
}
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;
@@ -311,7 +311,7 @@ void wxToolBarSimple::DrawTool(wxDC& dc, wxMemoryDC& memDC, wxToolBarTool *tool)
}
}
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)
@@ -336,7 +336,7 @@ void wxToolBarSimple::ToggleTool(const int index, const bool toggle)
// 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) {

2
src/common/valtext.cpp
View File

@@ -41,7 +41,7 @@ BEGIN_EVENT_TABLE(wxTextValidator, wxValidator)
END_EVENT_TABLE()
#endif
wxTextValidator::wxTextValidator(const long style, wxString *val)
wxTextValidator::wxTextValidator(long style, wxString *val)
{
m_validatorStyle = style ;
m_stringValue = val ;

76
src/generic/choicdgg.cpp
View File

@@ -35,10 +35,10 @@
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 )
@@ -50,10 +50,10 @@ wxString wxGetSingleChoice( const wxString& message, const wxString& caption, co
}
// 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;
@@ -67,10 +67,10 @@ wxString wxGetSingleChoice( const wxString& message, const wxString& caption, co
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 )
@@ -82,10 +82,10 @@ int wxGetSingleChoiceIndex( const wxString& message, const wxString& caption, co
}
// 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;
@@ -99,10 +99,10 @@ int wxGetSingleChoiceIndex( const wxString& message, const wxString& caption, co
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 )
@@ -114,10 +114,10 @@ char *wxGetSingleChoiceData( const wxString& message, const wxString& caption, c
}
// 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;
@@ -150,10 +150,10 @@ selected.
*/
/*
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;
}
@@ -164,13 +164,14 @@ int wxGetMultipleChoice(const wxString& message, const wxString& caption,
#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);
@@ -198,8 +199,8 @@ bool wxSingleChoiceDialog::Create(wxWindow *parent, const wxString& message, con
}
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;
@@ -312,4 +313,17 @@ void wxSingleChoiceDialog::OnOK(wxCommandEvent& WXUNUSED(event))
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);
}

2
src/generic/imaglist.cpp
View File

@@ -99,7 +99,7 @@ bool wxImageList::GetSize( int index, int &width, int &height ) const
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;

184
src/generic/listctrl.cpp
View File

@@ -56,23 +56,23 @@ void wxListItemData::SetText( const wxString &s )
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;
@@ -93,7 +93,7 @@ bool wxListItemData::HasText(void) const
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));
};
@@ -176,25 +176,25 @@ void wxListHeaderData::SetItem( const wxListItem &item )
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;
};
@@ -249,7 +249,7 @@ int wxListHeaderData::GetFormat(void) const
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;
@@ -259,7 +259,7 @@ wxListLineData::wxListLineData( wxListMainWindow *owner, const int mode, wxBrush
m_spacing = 0;
};
void wxListLineData::CalculateSize( wxPaintDC *dc, const int spacing )
void wxListLineData::CalculateSize( wxPaintDC *dc, int spacing )
{
m_spacing = spacing;
switch (m_mode)
@@ -318,7 +318,7 @@ void wxListLineData::CalculateSize( wxPaintDC *dc, const int spacing )
};
};
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;
@@ -393,7 +393,7 @@ void wxListLineData::SetPosition( wxPaintDC *dc, const int x, const int y, const
};
};
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 );
@@ -431,7 +431,7 @@ void wxListLineData::GetRect( wxRectangle &rect )
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)
@@ -446,12 +446,12 @@ long wxListLineData::IsHit( const int x, const int y )
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)
@@ -472,7 +472,7 @@ void wxListLineData::GetItem( int const index, wxListItem &info )
};
};
void wxListLineData::GetText( const int index, wxString &s )
void wxListLineData::GetText( int index, wxString &s )
{
int i = index;
wxNode *node = m_items.Nth( i );
@@ -484,7 +484,7 @@ void wxListLineData::GetText( const int index, wxString &s )
};
};
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 );
@@ -495,7 +495,7 @@ void wxListLineData::SetText( const int index, const wxString s )
};
};
int wxListLineData::GetImage( const int index )
int wxListLineData::GetImage( int index )
{
int i = index;
wxNode *node = m_items.Nth( i );
@@ -507,7 +507,7 @@ int wxListLineData::GetImage( const int index )
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 );
@@ -572,7 +572,7 @@ void wxListLineData::DoDraw( wxPaintDC *dc, const bool hilight, const bool paint
};
};
void wxListLineData::Hilight( const bool on )
void wxListLineData::Hilight( bool on )
{
if (on == m_hilighted) return;
if (on)
@@ -591,7 +591,7 @@ void wxListLineData::ReverseHilight( void )
m_owner->DeselectLine( this );
};
void wxListLineData::DrawRubberBand( wxPaintDC *dc, const bool on )
void wxListLineData::DrawRubberBand( wxPaintDC *dc, bool on )
{
if (on)
{
@@ -607,7 +607,7 @@ void wxListLineData::Draw( wxPaintDC *dc )
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));
};
@@ -617,7 +617,7 @@ bool wxListLineData::IsHilighted( void )
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;
@@ -652,9 +652,9 @@ wxListHeaderWindow::wxListHeaderWindow( void )
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;
@@ -809,10 +809,10 @@ wxListMainWindow::wxListMainWindow( void )
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 );
@@ -913,7 +913,7 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
dc.EndDrawing();
};
void wxListMainWindow::HilightAll( const bool on )
void wxListMainWindow::HilightAll( bool on )
{
wxNode *node = m_lines.First();
while (node)
@@ -1361,14 +1361,14 @@ int wxListMainWindow::GetIndexOfLine( const wxListLineData *line )
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)
@@ -1381,12 +1381,12 @@ void wxListMainWindow::SetItemSpacing( const int spacing, const bool 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 );
@@ -1398,7 +1398,7 @@ void wxListMainWindow::SetColumn( const int col, wxListItem &item )
};
};
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 );
@@ -1409,7 +1409,7 @@ void wxListMainWindow::SetColumnWidth( const int col, const int width )
};
};
void wxListMainWindow::GetColumn( const int col, wxListItem &item )
void wxListMainWindow::GetColumn( int col, wxListItem &item )
{
wxNode *node = m_columns.Nth( col );
if (node)
@@ -1427,7 +1427,7 @@ void wxListMainWindow::GetColumn( const int col, wxListItem &item )
};
};
int wxListMainWindow::GetColumnWidth( const int col )
int wxListMainWindow::GetColumnWidth( int col )
{
wxNode *node = m_columns.Nth( col );
if (node)
@@ -1461,7 +1461,7 @@ void wxListMainWindow::SetItem( wxListItem &item )
};
};
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;
@@ -1492,7 +1492,7 @@ void wxListMainWindow::SetItemState( const long item, const long state, const lo
};
};
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)
@@ -1538,7 +1538,7 @@ int wxListMainWindow::GetItemCount( void )
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)
@@ -1568,7 +1568,7 @@ int wxListMainWindow::GetSelectedItemCount( void )
return 0;
};
void wxListMainWindow::SetMode( const long mode )
void wxListMainWindow::SetMode( long mode )
{
m_dirty = TRUE;
m_mode = mode;
@@ -1708,7 +1708,7 @@ void wxListMainWindow::RealizeChanges( void )
};
};
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;
@@ -1725,7 +1725,7 @@ long wxListMainWindow::GetNextItem( const long item, int WXUNUSED(geometry), int
return -1;
};
void wxListMainWindow::DeleteItem( const long index )
void wxListMainWindow::DeleteItem( long index )
{
m_dirty = TRUE;
wxNode *node = m_lines.Nth( index );
@@ -1737,7 +1737,7 @@ void wxListMainWindow::DeleteItem( const long index )
};
};
void wxListMainWindow::DeleteColumn( const int col )
void wxListMainWindow::DeleteColumn( int col )
{
m_dirty = TRUE;
wxNode *node = m_columns.Nth( col );
@@ -1773,7 +1773,7 @@ void wxListMainWindow::DeleteEverything( void )
m_columns.Clear();
};
void wxListMainWindow::EnsureVisible( const long index )
void wxListMainWindow::EnsureVisible( long index )
{
wxListLineData *oldCurrent = m_current;
m_current = NULL;
@@ -1784,7 +1784,7 @@ void wxListMainWindow::EnsureVisible( const long index )
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;
@@ -1802,7 +1802,7 @@ long wxListMainWindow::FindItem(const long start, const wxString& str, const boo
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;
@@ -1819,7 +1819,7 @@ long wxListMainWindow::FindItem(const long start, const long data)
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;
@@ -1862,7 +1862,7 @@ void wxListMainWindow::InsertItem( wxListItem &item )
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)
@@ -1958,9 +1958,9 @@ wxListCtrl::wxListCtrl(void)
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 );
@@ -1970,9 +1970,9 @@ wxListCtrl::~wxListCtrl(void)
{
}
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;
@@ -2004,7 +2004,7 @@ void wxListCtrl::OnSize( wxSizeEvent &WXUNUSED(event) )
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();
@@ -2027,7 +2027,7 @@ void wxListCtrl::SetSingleStyle( const long style, const bool add )
SetWindowStyleFlag( flag );
};
void wxListCtrl::SetWindowStyleFlag( const long flag )
void wxListCtrl::SetWindowStyleFlag( long flag )
{
m_mainWin->DeleteEverything();
@@ -2072,24 +2072,24 @@ void wxListCtrl::SetBackgroundColour(const wxColour& col)
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;
@@ -2118,7 +2118,7 @@ bool wxListCtrl::SetItem( wxListItem &info )
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;
@@ -2135,18 +2135,18 @@ long wxListCtrl::SetItem( const long index, const int col, const wxString& 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;
@@ -2156,7 +2156,7 @@ bool wxListCtrl::SetItemImage( const long item, const int image, const int WXUNU
return TRUE;
};
wxString wxListCtrl::GetItemText( const long item )
wxString wxListCtrl::GetItemText( long item )
{
wxListItem info;
info.m_itemId = item;
@@ -2164,7 +2164,7 @@ wxString wxListCtrl::GetItemText( const long 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;
@@ -2173,7 +2173,7 @@ void wxListCtrl::SetItemText( const long item, const wxString &str )
m_mainWin->SetItem( info );
};
long wxListCtrl::GetItemData( const long item )
long wxListCtrl::GetItemData( long item )
{
wxListItem info;
info.m_itemId = item;
@@ -2181,7 +2181,7 @@ long wxListCtrl::GetItemData( const long 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;
@@ -2191,18 +2191,18 @@ bool wxListCtrl::SetItemData( const long item, long 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;
};
@@ -2237,12 +2237,12 @@ long wxListCtrl::GetTopItem(void)
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)
{
@@ -2259,17 +2259,17 @@ wxImageList *wxListCtrl::GetImageList(const int which)
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;
@@ -2281,36 +2281,36 @@ bool wxListCtrl::DeleteAllItems(void)
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;
};
@@ -2326,7 +2326,7 @@ long wxListCtrl::InsertItem( wxListItem& info )
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;
@@ -2335,7 +2335,7 @@ long wxListCtrl::InsertItem( const long index, const wxString &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;
@@ -2344,7 +2344,7 @@ long wxListCtrl::InsertItem( const long index, const int imageIndex )
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;
@@ -2354,14 +2354,14 @@ long wxListCtrl::InsertItem( const long index, const wxString &label, const int
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;
@@ -2377,7 +2377,7 @@ long wxListCtrl::InsertColumn( const long col, const wxString &heading,
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;
};

4
src/generic/msgdlgg.cpp
View File

@@ -173,8 +173,8 @@ void wxGenericMessageDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
}
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);

4
src/generic/panelg.cpp
View File

@@ -41,10 +41,10 @@ wxPanel::wxPanel(void)
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);

18
src/generic/scrolwin.cpp
View File

@@ -54,10 +54,10 @@ wxScrolledWindow::wxScrolledWindow(void)
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;
@@ -78,9 +78,9 @@ bool wxScrolledWindow::Create(wxWindow *parent, const wxWindowID id,
* 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 =
(
@@ -385,7 +385,7 @@ void wxScrolledWindow::SetScrollPageSize(int orient, int pageSize)
/*
* 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);
@@ -408,7 +408,7 @@ void wxScrolledWindow::Scroll (const int x_pos, const int y_pos)
#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;
@@ -427,13 +427,13 @@ void wxScrolledWindow::ViewStart (int *x, int *y) const
*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);

14
src/generic/splitter.cpp
View File

@@ -67,8 +67,8 @@ wxSplitterWindow::wxSplitterWindow(void)
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;
@@ -341,7 +341,7 @@ void wxSplitterWindow::OnSize(wxSizeEvent& WXUNUSED(event))
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
@@ -481,7 +481,7 @@ void wxSplitterWindow::DrawSash(wxDC& dc)
}
// 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);
@@ -591,7 +591,7 @@ void wxSplitterWindow::Initialize(wxWindow *window)
// 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;
@@ -609,7 +609,7 @@ bool wxSplitterWindow::SplitVertically(wxWindow *window1, wxWindow *window2, con
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;
@@ -658,7 +658,7 @@ bool wxSplitterWindow::Unsplit(wxWindow *toRemove)
return TRUE;
}
void wxSplitterWindow::SetSashPosition(const int position, const bool redraw)
void wxSplitterWindow::SetSashPosition(int position, bool redraw)
{
m_sashPosition = position;

18
src/generic/statusbr.cpp
View File

@@ -70,10 +70,10 @@ wxStatusBar::~wxStatusBar(void)
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;
@@ -94,7 +94,7 @@ bool wxStatusBar::Create(wxWindow *parent, const wxWindowID id,
return success;
}
void wxStatusBar::SetFieldsCount(const int number, const int *widths)
void wxStatusBar::SetFieldsCount(int number, int *widths)
{
m_nFields = number;
@@ -114,7 +114,7 @@ void wxStatusBar::SetFieldsCount(const int number, const int *widths)
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;
@@ -130,7 +130,7 @@ void wxStatusBar::SetStatusText(const wxString& text, const int number)
#endif
}
wxString wxStatusBar::GetStatusText(const int n) const
wxString wxStatusBar::GetStatusText(int n) const
{
if ((n < 0) || (n >= m_nFields))
return wxString("");
@@ -138,7 +138,7 @@ wxString wxStatusBar::GetStatusText(const int n) const
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)
@@ -178,7 +178,7 @@ void wxStatusBar::OnPaint(wxPaintEvent& WXUNUSED(event) )
DrawField(dc, i);
}
void wxStatusBar::DrawFieldText(wxDC& dc, const int i)
void wxStatusBar::DrawFieldText(wxDC& dc, int i)
{
int leftMargin = 2;
@@ -201,7 +201,7 @@ void wxStatusBar::DrawFieldText(wxDC& dc, const int i)
dc.DestroyClippingRegion();
}
void wxStatusBar::DrawField(wxDC& dc, const int i)
void wxStatusBar::DrawField(wxDC& dc, int i)
{
wxRectangle rect;
GetFieldRect(i, rect);
@@ -232,7 +232,7 @@ void wxStatusBar::DrawField(wxDC& dc, const int i)
}
// 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;

8
src/generic/tabg.cpp
View File

@@ -1018,10 +1018,10 @@ BEGIN_EVENT_TABLE(wxTabbedDialog, wxDialog)
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;
@@ -1062,8 +1062,8 @@ BEGIN_EVENT_TABLE(wxTabbedPanel, wxPanel)
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;

4
src/generic/treectrl.cpp
View File

@@ -357,7 +357,7 @@ wxTreeCtrl::wxTreeCtrl()
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 )
@@ -381,7 +381,7 @@ wxTreeCtrl::~wxTreeCtrl()
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

18
src/gtk/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/gtk/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/gtk/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/gtk/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/gtk/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/gtk/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/gtk/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/gtk/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/gtk/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/gtk/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/gtk/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/gtk/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/gtk/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/gtk/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/gtk/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/gtk/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/gtk/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/gtk/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/gtk/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/gtk/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/gtk/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/gtk/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/gtk/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/gtk/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/gtk/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/gtk/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/gtk/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/gtk/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)

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)

13
src/msw/app.cpp
View File

@@ -873,19 +873,6 @@ bool wxApp::SendIdleEvents(wxWindow* win)
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();

50
src/msw/bitmap.cpp
View File

@@ -124,7 +124,7 @@ bool wxBitmap::FreeResource(bool force)
}
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;
@@ -146,7 +146,7 @@ wxBitmap::wxBitmap(const char bits[], const int the_width, const int the_height,
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);
@@ -154,7 +154,7 @@ wxBitmap::wxBitmap(const int w, const int h, const int 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);
@@ -162,7 +162,7 @@ wxBitmap::wxBitmap(void *data, const long type, const int width, const int heigh
wxTheBitmapList->AddBitmap(this);
}
wxBitmap::wxBitmap(const wxString& filename, const long type)
wxBitmap::wxBitmap(const wxString& filename, long type)
{
LoadFile(filename, (int)type);
@@ -178,7 +178,7 @@ wxBitmap::wxBitmap(const char **data, wxItem *WXUNUSED(anItem))
}
#endif
bool wxBitmap::Create(const int w, const int h, const int d)
bool wxBitmap::Create(int w, int h, int d)
{
UnRef();
@@ -206,7 +206,7 @@ bool wxBitmap::Create(const int w, const int h, const int d)
return M_BITMAPDATA->m_ok;
}
bool wxBitmap::LoadFile(const wxString& filename, const long type)
bool wxBitmap::LoadFile(const wxString& filename, long type)
{
UnRef();
@@ -223,7 +223,7 @@ bool wxBitmap::LoadFile(const wxString& filename, const long type)
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();
@@ -240,7 +240,7 @@ bool wxBitmap::Create(void *data, const long type, const int width, const int he
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);
@@ -398,7 +398,7 @@ wxMask::wxMask(const wxBitmap& bitmap, const wxColour& colour)
// 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);
@@ -448,7 +448,7 @@ bool wxMask::Create(const wxBitmap& bitmap)
// 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 )
{
@@ -525,18 +525,18 @@ bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour)
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;
}
@@ -556,12 +556,12 @@ public:
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.
@@ -594,13 +594,13 @@ public:
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
@@ -625,7 +625,7 @@ bool wxBMPFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, const lo
#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;
@@ -648,13 +648,13 @@ public:
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
@@ -697,7 +697,7 @@ bool wxXPMFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, const lo
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;
@@ -743,11 +743,11 @@ public:
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;

4
src/msw/bmpbuttn.cpp
View File

@@ -32,9 +32,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton)
#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)
{

6
src/msw/brush.cpp
View File

@@ -63,7 +63,7 @@ wxBrush::~wxBrush()
wxTheBrushList->RemoveBrush(this);
}
wxBrush::wxBrush(const wxColour& col, const int Style)
wxBrush::wxBrush(const wxColour& col, int Style)
{
m_refData = new wxBrushRefData;
@@ -77,7 +77,7 @@ wxBrush::wxBrush(const wxColour& col, const int Style)
wxTheBrushList->AddBrush(this);
}
wxBrush::wxBrush(const wxString& col, const int Style)
wxBrush::wxBrush(const wxString& col, int Style)
{
m_refData = new wxBrushRefData;
@@ -238,7 +238,7 @@ void wxBrush::SetColour(const unsigned char r, const unsigned char g, const unsi
RealizeResource();
}
void wxBrush::SetStyle(const int Style)
void wxBrush::SetStyle(int Style)
{
if ( !M_BRUSHDATA )
m_refData = new wxBrushRefData;

27
src/msw/button.cpp
View File

@@ -34,7 +34,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
// Buttons
bool wxButton::MSWCommand(const WXUINT param, const WXWORD id)
bool wxButton::MSWCommand(WXUINT param, WXWORD id)
{
if (param == BN_CLICKED)
{
@@ -46,9 +46,9 @@ bool wxButton::MSWCommand(const WXUINT param, const WXWORD id)
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)
{
@@ -95,7 +95,7 @@ bool wxButton::Create(wxWindow *parent, const wxWindowID id, const wxString& lab
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(&currentX, &currentY);
@@ -111,8 +111,8 @@ void wxButton::SetSize(const int x, const int y, const int width, const int heig
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, &current_width, &cyf,NULL,NULL,GetFont());
@@ -137,19 +137,6 @@ void wxButton::SetSize(const int x, const int y, const int width, const int heig
}
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)
@@ -175,7 +162,7 @@ void wxButton::SetLabel(const wxString& label)
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)
{
/*

44
src/msw/checkbox.cpp
View File

@@ -31,7 +31,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl)
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());
@@ -41,9 +41,9 @@ bool wxCheckBox::MSWCommand(const WXUINT WXUNUSED(param), const WXWORD WXUNUSED(
}
// 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)
{
@@ -116,7 +116,7 @@ void wxCheckBox::SetLabel(const wxString& label)
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(&currentX, &currentY);
@@ -132,10 +132,7 @@ void wxCheckBox::SetSize(const int x, const int y, const int width, const int he
char buf[300];
float current_width;
float cyf;
int current_width, cyf;
HWND button = (HWND) GetHWND();
GetWindowText(button, buf, 300);
@@ -160,20 +157,9 @@ void wxCheckBox::SetSize(const int x, const int y, const int width, const int he
}
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);
}
@@ -187,7 +173,7 @@ bool wxCheckBox::GetValue(void) const
#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
@@ -221,9 +207,9 @@ void wxCheckBox::Command (wxCommandEvent & event)
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)
{
@@ -279,7 +265,7 @@ void wxBitmapCheckBox::SetLabel(const wxBitmap *bitmap)
{
}
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(&currentX, &currentY);
@@ -302,17 +288,9 @@ void wxBitmapCheckBox::SetSize(const int x, const int y, const int width, const
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);
}

6
src/msw/checklst.cpp
View File

@@ -219,10 +219,10 @@ wxCheckListBox::wxCheckListBox() : wxListBox()
}
// 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.

30
src/msw/choice.cpp
View File

@@ -30,7 +30,7 @@
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)
{
@@ -45,11 +45,11 @@ bool wxChoice::MSWCommand(const WXUINT param, const WXWORD WXUNUSED(id))
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)
{
@@ -124,7 +124,7 @@ void wxChoice::Append(const wxString& item)
no_strings ++;
}
void wxChoice::Delete(const int n)
void wxChoice::Delete(int n)
{
no_strings = (int)SendMessage((HWND) GetHWND(), CB_DELETESTRING, n, 0);
}
@@ -142,7 +142,7 @@ int wxChoice::GetSelection(void) const
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);
}
@@ -170,14 +170,14 @@ int wxChoice::FindString(const wxString& s) const
#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(&currentX, &currentY);
@@ -220,7 +220,7 @@ void wxChoice::SetSize(const int x, const int y, const int width, const int heig
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++)
@@ -257,19 +257,9 @@ void wxChoice::SetSize(const int x, const int y, const int width, const int heig
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;

18
src/msw/combobox.cpp
View File

@@ -34,7 +34,7 @@
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)
{
@@ -49,12 +49,12 @@ bool wxComboBox::MSWCommand(const WXUINT param, const WXWORD WXUNUSED(id))
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)
{
@@ -188,14 +188,14 @@ void wxComboBox::Paste(void)
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();
@@ -247,7 +247,7 @@ long wxComboBox::GetLastPosition(void) const
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();
@@ -270,7 +270,7 @@ void wxComboBox::Replace(const long from, const long to, const wxString& value)
#endif
}
void wxComboBox::Remove(const long from, const long to)
void wxComboBox::Remove(long from, long to)
{
HWND hWnd = (HWND) GetHWND();
long fromChar = from;
@@ -285,7 +285,7 @@ void wxComboBox::Remove(const long from, const long to)
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;

12
src/msw/control.cpp
View File

@@ -132,7 +132,7 @@ void wxConvertDialogToPixels(wxWindow *control, int *x, int *y)
}
*/
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 :-(
@@ -172,7 +172,9 @@ void wxControl::MSWOnMouseMove(const int x, const int y, const WXUINT flags)
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)
@@ -180,7 +182,7 @@ 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);
@@ -291,12 +293,12 @@ void wxControl::OnEraseBackground(wxEraseEvent& event)
::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;

8
src/msw/cursor.cpp
View File

@@ -66,12 +66,12 @@ wxCursor::wxCursor(void)
{
}
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;
@@ -123,7 +123,7 @@ wxCursor::wxCursor(const wxString& cursor_file, const long flags, const int hotS
}
// Cursors by stock number
wxCursor::wxCursor(const int cursor_type)
wxCursor::wxCursor(int cursor_type)
{
m_refData = new wxIconRefData;

2
src/msw/dcprint.cpp
View File

@@ -54,7 +54,7 @@
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;

25
src/msw/dialog.cpp
View File

@@ -81,11 +81,11 @@ wxDialog::wxDialog(void)
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));
@@ -144,7 +144,7 @@ bool wxDialog::Create(wxWindow *parent, const wxWindowID id,
return TRUE;
}
void wxDialog::SetModal(const bool flag)
void wxDialog::SetModal(bool flag)
{
if ( flag )
m_windowStyle |= wxDIALOG_MODAL ;
@@ -229,7 +229,7 @@ void wxDialog::Fit(void)
wxWindow::Fit();
}
void wxDialog::Iconize(const bool WXUNUSED(iconize))
void wxDialog::Iconize(bool WXUNUSED(iconize))
{
// Windows dialog boxes can't be iconized
}
@@ -239,12 +239,12 @@ bool wxDialog::IsIconized(void) const
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;
@@ -260,13 +260,10 @@ void wxDialog::SetClientSize(const int width, const int height)
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
@@ -284,7 +281,7 @@ bool wxDialog::IsShown(void) const
return m_isShown;
}
bool wxDialog::Show(const bool show)
bool wxDialog::Show(bool show)
{
m_isShown = show;
@@ -453,7 +450,7 @@ wxString wxDialog::GetTitle(void) const
return wxString(wxBuffer);
}
void wxDialog::Centre(const int direction)
void wxDialog::Centre(int direction)
{
int x_offset,y_offset ;
int display_width, display_height;
@@ -504,7 +501,7 @@ void wxDialog::EndModal(int retCode)
}
// 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

6
src/msw/filedlg.cpp
View File

@@ -118,10 +118,10 @@ char *wxFileSelectorEx( const char *title,
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 : "",

10
src/msw/font.cpp
View File

@@ -243,28 +243,28 @@ bool wxFont::IsFree(void)
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;
@@ -278,7 +278,7 @@ void wxFont::SetFaceName(const wxString& faceName)
M_FONTDATA->m_faceName = faceName;
}
void wxFont::SetUnderlined(const bool underlined)
void wxFont::SetUnderlined(bool underlined)
{
if ( !m_refData )
m_refData = new wxFontRefData;

77
src/msw/frame.cpp
View File

@@ -76,11 +76,11 @@ wxFrame::wxFrame(void)
}
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)
@@ -171,7 +171,7 @@ void wxFrame::GetClientSize(int *x, int *y) const
// 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();
@@ -199,13 +199,10 @@ void wxFrame::SetClientSize(const int width, const int height)
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
@@ -228,7 +225,7 @@ void wxFrame::GetPosition(int *x, int *y) 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;
@@ -249,16 +246,12 @@ void wxFrame::SetSize(const int x, const int y, const int width, const int heigh
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)
@@ -283,18 +276,14 @@ bool wxFrame::Show(const bool 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);
@@ -309,7 +298,7 @@ void wxFrame::Iconize(const bool iconize)
}
// Equivalent to maximize/restore in Windows
void wxFrame::Maximize(const bool maximize)
void wxFrame::Maximize(bool maximize)
{
Show(TRUE);
int cshow;
@@ -348,7 +337,7 @@ void wxFrame::SetIcon(const wxIcon& icon)
#endif
}
wxStatusBar *wxFrame::OnCreateStatusBar(const int number)
wxStatusBar *wxFrame::OnCreateStatusBar(int number)
{
wxStatusBar *statusBar = NULL;
@@ -378,7 +367,7 @@ wxStatusBar *wxFrame::OnCreateStatusBar(const int number)
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,
@@ -394,14 +383,14 @@ bool wxFrame::CreateStatusBar(const int number)
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" );
@@ -543,8 +532,8 @@ void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
*
*/
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);
@@ -644,7 +633,10 @@ bool wxFrame::MSWOnPaint(void)
}
else
{
GetEventHandler()->OldOnPaint();
wxPaintEvent event(m_windowId);
event.m_eventObject = this;
if (!GetEventHandler()->ProcessEvent(event))
Default();
}
return 0;
}
@@ -659,7 +651,7 @@ WXHICON wxFrame::MSWOnQueryDragIcon(void)
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);
@@ -689,13 +681,10 @@ void wxFrame::MSWOnSize(const int x, const int y, const WXUINT id)
#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();
}
}
@@ -707,7 +696,7 @@ bool wxFrame::MSWOnClose(void)
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);
@@ -731,14 +720,8 @@ bool wxFrame::MSWOnCommand(const WXWORD id, const WXWORD cmd, const WXHWND contr
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);
@@ -751,7 +734,6 @@ void wxFrame::MSWOnMenuHighlight(const WXWORD nItem, const WXWORD nFlags, const
event.SetEventObject( this );
GetEventHandler()->ProcessEvent(event);
}
#endif
}
bool wxFrame::MSWProcessMessage(WXMSG* pMsg)
@@ -870,6 +852,7 @@ void wxFrame::OnMenuHighlight(wxMenuEvent& event)
}
}
#if 0
#if WXWIN_COMPATIBILITY
void wxFrame::OldOnSize(int x, int y)
{
@@ -973,12 +956,15 @@ void wxFrame::OldOnMenuSelect(int id)
}
#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);
@@ -1010,17 +996,12 @@ void wxFrame::ProcessCommand(int id)
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)

24
src/msw/gauge95.cpp
View File

@@ -37,11 +37,11 @@
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)
{
@@ -93,7 +93,7 @@ bool wxGauge95::Create(wxWindow *parent, const wxWindowID id,
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(&currentX, &currentY);
@@ -121,32 +121,24 @@ void wxGauge95::SetSize(const int x, const int y, const int width, const int hei
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;

24
src/msw/gaugemsw.cpp
View File

@@ -63,11 +63,11 @@ BOOL FAR PASCAL gaugeInit(HINSTANCE hInstance);
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)
{
@@ -140,7 +140,7 @@ bool wxGaugeMSW::Create(wxWindow *parent, const wxWindowID id,
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(&currentX, &currentY);
@@ -168,34 +168,26 @@ void wxGaugeMSW::SetSize(const int x, const int y, const int width, const int he
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;

10
src/msw/icon.cpp
View File

@@ -68,11 +68,11 @@ wxIcon::wxIcon(void)
{
}
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)
{
@@ -93,7 +93,7 @@ bool wxIcon::FreeResource(bool force)
return TRUE;
}
bool wxIcon::LoadFile(const wxString& filename, const long type,
bool wxIcon::LoadFile(const wxString& filename, long type,
int desiredWidth, int desiredHeight)
{
UnRef();
@@ -116,7 +116,7 @@ void wxIcon::SetHICON(WXHICON ico)
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
@@ -137,7 +137,7 @@ bool wxICOFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, const lo
#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)) )

14
src/msw/imaglist.cpp
View File

@@ -66,7 +66,7 @@ int wxImageList::GetImageCount(void) const
////////////////////////////////////////////////////////////////////////////
// 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 )
@@ -109,7 +109,7 @@ int wxImageList::Add(const wxIcon& icon)
// 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;
@@ -122,7 +122,7 @@ bool wxImageList::Replace(const int index, const wxBitmap& bitmap, const wxBitma
// 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());
@@ -131,14 +131,14 @@ bool wxImageList::Replace(const int index, const wxBitmap& bitmap, const wxColou
*/
// 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);
}
@@ -158,8 +158,8 @@ bool wxImageList::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 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 )

54
src/msw/listbox.cpp
View File

@@ -81,7 +81,7 @@ wxOwnerDrawn *wxListBox::CreateItem(uint n)
// 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)
@@ -118,7 +118,9 @@ bool wxListBox::MSWCommand(const WXUINT param, const WXWORD WXUNUSED(id))
{
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();
@@ -127,6 +129,7 @@ bool wxListBox::MSWCommand(const WXUINT param, const WXWORD WXUNUSED(id))
#endif
return TRUE;
}
*/
}
return FALSE;
}
@@ -138,11 +141,11 @@ wxListBox::wxListBox(void)
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)
{
@@ -266,7 +269,7 @@ void wxListBox::SetupColours(void)
SetForegroundColour(GetParent()->GetDefaultForegroundColour());
}
void wxListBox::SetFirstItem(const int N)
void wxListBox::SetFirstItem(int N)
{
SendMessage(hwnd,LB_SETTOPINDEX,(WPARAM)N,(LPARAM)0) ;
}
@@ -279,7 +282,7 @@ void wxListBox::SetFirstItem(const wxString& s)
SetFirstItem(N) ;
}
void wxListBox::Delete(const int N)
void wxListBox::Delete(int N)
{
SendMessage(hwnd, LB_DELETESTRING, N, 0);
m_noItems --;
@@ -321,7 +324,7 @@ void wxListBox::Append(const wxString& item, char *Client_data)
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);
@@ -377,7 +380,7 @@ void wxListBox::Clear(void)
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);
@@ -390,23 +393,23 @@ void wxListBox::SetSelection(const int N, const bool select)
}
}
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");
@@ -456,7 +459,7 @@ int wxListBox::GetSelection() const
}
// 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("");
@@ -466,7 +469,7 @@ wxString wxListBox::GetString(const int N) const
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(&currentX, &currentY);
@@ -517,16 +520,6 @@ void wxListBox::SetSize(const int x, const int y, const int width, const int hei
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
@@ -590,7 +583,7 @@ void wxListBox::SetHorizontalExtent(const wxString& s)
}
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++)
@@ -611,7 +604,7 @@ wxListBox::InsertItems(const int nItems, const wxString items[], const int pos)
SetHorizontalExtent("");
}
void wxListBox::SetString(const int N, const wxString& s)
void wxListBox::SetString(int N, const wxString& s)
{
int sel = GetSelection();
@@ -653,7 +646,7 @@ wxString wxListBox::GetStringSelection (void) const
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)
@@ -683,7 +676,7 @@ void wxListBox::Command (wxCommandEvent & event)
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
@@ -733,9 +726,9 @@ long wxListBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
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:
@@ -763,6 +756,7 @@ long wxListBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
return MSWDefWindowProc(nMsg, wParam, lParam );
}
#endif
return wxControl::MSWWindowProc(nMsg, wParam, lParam);
}

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