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

-1->wxID_ANY, TRUE->true and FALSE->false replacements.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27435 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-05-25 19:25:01 +00:00
parent cb8f28ba1e
commit af870ed80f
3 changed files with 58 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
samples/grid/griddemo.cpp
View File

@@ -34,6 +34,7 @@
#include "wx/colordlg.h" #include "wx/colordlg.h"
#include "wx/fontdlg.h" #include "wx/fontdlg.h"
#include "wx/numdlg.h"
#include "wx/grid.h" #include "wx/grid.h"
#include "wx/generic/gridctrl.h" #include "wx/generic/gridctrl.h"
@@ -57,9 +58,9 @@ IMPLEMENT_APP( GridApp )
bool GridApp::OnInit() bool GridApp::OnInit()
{ {
GridFrame *frame = new GridFrame; GridFrame *frame = new GridFrame;
frame->Show( TRUE ); frame->Show(true);
return TRUE; return true;
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -130,7 +131,7 @@ END_EVENT_TABLE()
GridFrame::GridFrame() GridFrame::GridFrame()
: wxFrame( (wxFrame *)NULL, -1, _T("wxWidgets grid class demo"), : wxFrame( (wxFrame *)NULL, wxID_ANY, _T("wxWidgets grid class demo"),
wxDefaultPosition, wxDefaultPosition,
wxDefaultSize ) wxDefaultSize )
{ {
@@ -226,15 +227,15 @@ GridFrame::GridFrame()
SetMenuBar( menuBar ); SetMenuBar( menuBar );
m_addToSel = FALSE; m_addToSel = false;
grid = new wxGrid( this, grid = new wxGrid( this,
-1, wxID_ANY,
wxPoint( 0, 0 ), wxPoint( 0, 0 ),
wxSize( 400, 300 ) ); wxSize( 400, 300 ) );
logWin = new wxTextCtrl( this, logWin = new wxTextCtrl( this,
-1, wxID_ANY,
wxEmptyString, wxEmptyString,
wxPoint( 0, gridH + 20 ), wxPoint( 0, gridH + 20 ),
wxSize( logW, logH ), wxSize( logW, logH ),
@@ -328,7 +329,7 @@ GridFrame::GridFrame()
grid->SetCellEditor(4, 0, new wxGridCellChoiceEditor(WXSIZEOF(choices), choices)); grid->SetCellEditor(4, 0, new wxGridCellChoiceEditor(WXSIZEOF(choices), choices));
grid->SetCellSize(4, 0, 1, 2); grid->SetCellSize(4, 0, 1, 2);
grid->SetCellValue(4, 0, choices[0]); grid->SetCellValue(4, 0, choices[0]);
grid->SetCellOverflow(4, 0, FALSE); grid->SetCellOverflow(4, 0, false);
grid->SetCellSize(7, 1, 3, 4); grid->SetCellSize(7, 1, 3, 4);
grid->SetCellAlignment(7, 1, wxALIGN_CENTRE, wxALIGN_CENTRE); grid->SetCellAlignment(7, 1, wxALIGN_CENTRE, wxALIGN_CENTRE);
@@ -343,7 +344,7 @@ GridFrame::GridFrame()
0, 0,
wxEXPAND ); wxEXPAND );
SetAutoLayout( TRUE ); SetAutoLayout(true);
SetSizer( topSizer ); SetSizer( topSizer );
topSizer->Fit( this ); topSizer->Fit( this );
@@ -362,14 +363,14 @@ GridFrame::~GridFrame()
void GridFrame::SetDefaults() void GridFrame::SetDefaults()
{ {
GetMenuBar()->Check( ID_TOGGLEROWLABELS, TRUE ); GetMenuBar()->Check( ID_TOGGLEROWLABELS, true );
GetMenuBar()->Check( ID_TOGGLECOLLABELS, TRUE ); GetMenuBar()->Check( ID_TOGGLECOLLABELS, true );
GetMenuBar()->Check( ID_TOGGLEEDIT, TRUE ); GetMenuBar()->Check( ID_TOGGLEEDIT, true );
GetMenuBar()->Check( ID_TOGGLEROWSIZING, TRUE ); GetMenuBar()->Check( ID_TOGGLEROWSIZING, true );
GetMenuBar()->Check( ID_TOGGLECOLSIZING, TRUE ); GetMenuBar()->Check( ID_TOGGLECOLSIZING, true );
GetMenuBar()->Check( ID_TOGGLEGRIDSIZING, TRUE ); GetMenuBar()->Check( ID_TOGGLEGRIDSIZING, true );
GetMenuBar()->Check( ID_TOGGLEGRIDLINES, TRUE ); GetMenuBar()->Check( ID_TOGGLEGRIDLINES, true );
GetMenuBar()->Check( ID_CELLOVERFLOW, TRUE ); GetMenuBar()->Check( ID_CELLOVERFLOW, true );
} }
@@ -539,7 +540,7 @@ void GridFrame::SetRowLabelHorizAlignment( wxCommandEvent& WXUNUSED(ev) )
break; break;
} }
grid->SetRowLabelAlignment( horiz, -1 ); grid->SetRowLabelAlignment( horiz, vert );
} }
void GridFrame::SetRowLabelVertAlignment( wxCommandEvent& WXUNUSED(ev) ) void GridFrame::SetRowLabelVertAlignment( wxCommandEvent& WXUNUSED(ev) )
@@ -562,7 +563,7 @@ void GridFrame::SetRowLabelVertAlignment( wxCommandEvent& WXUNUSED(ev) )
break; break;
} }
grid->SetRowLabelAlignment( -1, vert ); grid->SetRowLabelAlignment( horiz, vert );
} }
@@ -586,7 +587,7 @@ void GridFrame::SetColLabelHorizAlignment( wxCommandEvent& WXUNUSED(ev) )
break; break;
} }
grid->SetColLabelAlignment( horiz, -1 ); grid->SetColLabelAlignment( horiz, vert );
} }
@@ -610,7 +611,7 @@ void GridFrame::SetColLabelVertAlignment( wxCommandEvent& WXUNUSED(ev) )
break; break;
} }
grid->SetColLabelAlignment( -1, vert ); grid->SetColLabelAlignment( horiz, vert );
} }
@@ -709,7 +710,7 @@ void GridFrame::SetCellBgColour( wxCommandEvent& WXUNUSED(ev) )
// which exactly fits the grid. // which exactly fits the grid.
wxRect r(wxPoint(0, 0), grid->GetSize()); wxRect r(wxPoint(0, 0), grid->GetSize());
grid->SetDefaultCellBackgroundColour(col); grid->SetDefaultCellBackgroundColour(col);
grid->Refresh(TRUE, &r); grid->Refresh(true, &r);
} }
} }
@@ -916,24 +917,24 @@ void GridFrame::About( wxCommandEvent& WXUNUSED(ev) )
void GridFrame::OnQuit( wxCommandEvent& WXUNUSED(ev) ) void GridFrame::OnQuit( wxCommandEvent& WXUNUSED(ev) )
{ {
Close( TRUE ); Close( true );
} }
void GridFrame::OnBugsTable(wxCommandEvent& ) void GridFrame::OnBugsTable(wxCommandEvent& )
{ {
BugsGridFrame *frame = new BugsGridFrame; BugsGridFrame *frame = new BugsGridFrame;
frame->Show(TRUE); frame->Show(true);
} }
void GridFrame::OnSmallGrid(wxCommandEvent& ) void GridFrame::OnSmallGrid(wxCommandEvent& )
{ {
wxFrame* frame = new wxFrame(NULL, -1, _T("A Small Grid"), wxFrame* frame = new wxFrame(NULL, wxID_ANY, _T("A Small Grid"),
wxDefaultPosition, wxSize(640, 480)); wxDefaultPosition, wxSize(640, 480));
wxPanel* panel = new wxPanel(frame, -1); wxPanel* panel = new wxPanel(frame, wxID_ANY);
wxGrid* grid = new wxGrid(panel, -1, wxPoint(10,10), wxSize(400,400), wxGrid* grid = new wxGrid(panel, wxID_ANY, wxPoint(10,10), wxSize(400,400),
wxWANTS_CHARS | wxSIMPLE_BORDER); wxWANTS_CHARS | wxSIMPLE_BORDER);
grid->CreateGrid(3,3); grid->CreateGrid(3,3);
frame->Show(TRUE); frame->Show(true);
} }
void GridFrame::OnVTable(wxCommandEvent& ) void GridFrame::OnVTable(wxCommandEvent& )
@@ -961,7 +962,7 @@ void GridFrame::OnVTable(wxCommandEvent& )
if ( s_sizeGrid != -1 ) if ( s_sizeGrid != -1 )
{ {
BigGridFrame* win = new BigGridFrame(s_sizeGrid); BigGridFrame* win = new BigGridFrame(s_sizeGrid);
win->Show(TRUE); win->Show(true);
} }
} }
@@ -1033,17 +1034,17 @@ wxGridCellAttr *MyGridCellAttrProvider::GetAttr(int row, int col,
// ============================================================================ // ============================================================================
BigGridFrame::BigGridFrame(long sizeGrid) BigGridFrame::BigGridFrame(long sizeGrid)
: wxFrame(NULL, -1, _T("Plugin Virtual Table"), : wxFrame(NULL, wxID_ANY, _T("Plugin Virtual Table"),
wxDefaultPosition, wxSize(500, 450)) wxDefaultPosition, wxSize(500, 450))
{ {
m_grid = new wxGrid(this, -1, wxDefaultPosition, wxDefaultSize); m_grid = new wxGrid(this, wxID_ANY, wxDefaultPosition, wxDefaultSize);
m_table = new BigGridTable(sizeGrid); m_table = new BigGridTable(sizeGrid);
// VZ: I don't understand why this slows down the display that much, // VZ: I don't understand why this slows down the display that much,
// must profile it... // must profile it...
//m_table->SetAttrProvider(new MyGridCellAttrProvider); //m_table->SetAttrProvider(new MyGridCellAttrProvider);
m_grid->SetTable(m_table, TRUE); m_grid->SetTable(m_table, true);
#if defined __WXMOTIF__ #if defined __WXMOTIF__
// MB: the grid isn't getting a sensible default size under wxMotif // MB: the grid isn't getting a sensible default size under wxMotif
@@ -1101,10 +1102,10 @@ static struct BugsGridData
bool opened; bool opened;
} gs_dataBugsGrid [] = } gs_dataBugsGrid [] =
{ {
{ 18, _T("foo doesn't work"), Sev_Major, 1, _T("wxMSW"), TRUE }, { 18, _T("foo doesn't work"), Sev_Major, 1, _T("wxMSW"), true },
{ 27, _T("bar crashes"), Sev_Critical, 1, _T("all"), FALSE }, { 27, _T("bar crashes"), Sev_Critical, 1, _T("all"), false },
{ 45, _T("printing is slow"), Sev_Minor, 3, _T("wxMSW"), TRUE }, { 45, _T("printing is slow"), Sev_Minor, 3, _T("wxMSW"), true },
{ 68, _T("Rectangle() fails"), Sev_Normal, 1, _T("wxMSW"), FALSE }, { 68, _T("Rectangle() fails"), Sev_Normal, 1, _T("wxMSW"), false },
}; };
static const wxChar *headers[Col_Max] = static const wxChar *headers[Col_Max] =
@@ -1159,7 +1160,7 @@ int BugsGridTable::GetNumberCols()
bool BugsGridTable::IsEmptyCell( int WXUNUSED(row), int WXUNUSED(col) ) bool BugsGridTable::IsEmptyCell( int WXUNUSED(row), int WXUNUSED(col) )
{ {
return FALSE; return false;
} }
wxString BugsGridTable::GetValue( int row, int col ) wxString BugsGridTable::GetValue( int row, int col )
@@ -1234,7 +1235,7 @@ bool BugsGridTable::CanGetValueAs( int WXUNUSED(row), int col, const wxString& t
{ {
if ( typeName == wxGRID_VALUE_STRING ) if ( typeName == wxGRID_VALUE_STRING )
{ {
return TRUE; return true;
} }
else if ( typeName == wxGRID_VALUE_BOOL ) else if ( typeName == wxGRID_VALUE_BOOL )
{ {
@@ -1246,7 +1247,7 @@ bool BugsGridTable::CanGetValueAs( int WXUNUSED(row), int col, const wxString& t
} }
else else
{ {
return FALSE; return false;
} }
} }
@@ -1286,7 +1287,7 @@ bool BugsGridTable::GetValueAsBool( int row, int col )
{ {
wxFAIL_MSG(_T("unexpected column")); wxFAIL_MSG(_T("unexpected column"));
return FALSE; return false;
} }
} }
@@ -1331,13 +1332,13 @@ BugsGridTable::BugsGridTable()
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
BugsGridFrame::BugsGridFrame() BugsGridFrame::BugsGridFrame()
: wxFrame(NULL, -1, _T("Bugs table"), : wxFrame(NULL, wxID_ANY, _T("Bugs table"),
wxDefaultPosition, wxSize(500, 300)) wxDefaultPosition, wxSize(500, 300))
{ {
wxGrid *grid = new wxGrid(this, -1, wxDefaultPosition); wxGrid *grid = new wxGrid(this, wxID_ANY, wxDefaultPosition);
wxGridTableBase *table = new BugsGridTable(); wxGridTableBase *table = new BugsGridTable();
table->SetAttrProvider(new MyGridCellAttrProvider); table->SetAttrProvider(new MyGridCellAttrProvider);
grid->SetTable(table, TRUE); grid->SetTable(table, true);
wxGridCellAttr *attrRO = new wxGridCellAttr, wxGridCellAttr *attrRO = new wxGridCellAttr,
*attrRangeEditor = new wxGridCellAttr, *attrRangeEditor = new wxGridCellAttr,

2
samples/grid/griddemo.h
View File

@@ -185,7 +185,7 @@ public:
} }
void SetValue( int , int , const wxString& ) { /* ignore */ } void SetValue( int , int , const wxString& ) { /* ignore */ }
bool IsEmptyCell( int , int ) { return FALSE; } bool IsEmptyCell( int , int ) { return false; }
private: private:
long m_sizeGrid; long m_sizeGrid;

28
samples/mobile/wxedit/wxedit.cpp
View File

@@ -49,7 +49,7 @@ BEGIN_EVENT_TABLE(MyFrame,wxFrame)
EVT_MENU_RANGE(ID_LAST_1, ID_LAST_3, MyFrame::OnLastFiles) EVT_MENU_RANGE(ID_LAST_1, ID_LAST_3, MyFrame::OnLastFiles)
EVT_CLOSE(MyFrame::OnCloseWindow) EVT_CLOSE(MyFrame::OnCloseWindow)
EVT_UPDATE_UI(-1,MyFrame::OnUpdateUI) EVT_UPDATE_UI(wxID_ANY,MyFrame::OnUpdateUI)
END_EVENT_TABLE() END_EVENT_TABLE()
MyFrame::MyFrame( wxWindow *parent, wxWindowID id, const wxString &title, MyFrame::MyFrame( wxWindow *parent, wxWindowID id, const wxString &title,
@@ -64,7 +64,7 @@ MyFrame::MyFrame( wxWindow *parent, wxWindowID id, const wxString &title,
// Create edit control. Since it is the only // Create edit control. Since it is the only
// control in the frame, it will be resized // control in the frame, it will be resized
// to file it out. // to file it out.
m_text = new wxTextCtrl( this, -1, _T(""), wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE ); m_text = new wxTextCtrl( this, wxID_ANY, _T(""), wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE );
// Read .ini file for file history etc. // Read .ini file for file history etc.
wxConfig *conf = (wxConfig*) wxConfig::Get(); wxConfig *conf = (wxConfig*) wxConfig::Get();
@@ -112,7 +112,7 @@ void MyFrame::AddToHistory( const wxString &fname )
int index = m_history.Index( fname ); int index = m_history.Index( fname );
if (index != wxNOT_FOUND) if (index != wxNOT_FOUND)
m_history.Remove( (size_t) index ); m_history.RemoveAt( (size_t) index );
m_history.Insert( fname, 0 ); m_history.Insert( fname, 0 );
@@ -284,7 +284,7 @@ void MyFrame::OnAbout( wxCommandEvent& WXUNUSED(event) )
void MyFrame::OnQuit( wxCommandEvent& WXUNUSED(event) ) void MyFrame::OnQuit( wxCommandEvent& WXUNUSED(event) )
{ {
Close( TRUE ); Close( true );
} }
bool MyFrame::Save() bool MyFrame::Save()
@@ -296,7 +296,7 @@ bool MyFrame::Save()
else else
m_text->SaveFile( m_filename ); m_text->SaveFile( m_filename );
return TRUE; return true;
} }
bool MyFrame::Discard() bool MyFrame::Discard()
@@ -309,16 +309,16 @@ bool MyFrame::Discard()
int ret = dialog.ShowModal(); int ret = dialog.ShowModal();
if (ret == wxID_CANCEL) if (ret == wxID_CANCEL)
return FALSE; return false;
if (ret == wxID_YES) if (ret == wxID_YES)
{ {
if (!Save()) if (!Save())
return FALSE; return false;
} }
} }
return TRUE; return true;
} }
void MyFrame::OnUpdateUI( wxUpdateUIEvent &event ) void MyFrame::OnUpdateUI( wxUpdateUIEvent &event )
@@ -326,13 +326,13 @@ void MyFrame::OnUpdateUI( wxUpdateUIEvent &event )
switch (event.GetId()) switch (event.GetId())
{ {
case ID_COPY: case ID_COPY:
event.Enable( FALSE ); event.Enable( false );
break; break;
case ID_CUT: case ID_CUT:
event.Enable( FALSE ); event.Enable( false );
break; break;
case ID_PASTE: case ID_PASTE:
event.Enable( FALSE ); event.Enable( false );
break; break;
case ID_DELETE: case ID_DELETE:
#ifdef __WXUNIVERSAL__ #ifdef __WXUNIVERSAL__
@@ -398,10 +398,10 @@ bool MyApp::OnInit()
SetVendorName(_T("Free world")); SetVendorName(_T("Free world"));
SetAppName(_T("wxEdit")); SetAppName(_T("wxEdit"));
MyFrame *frame = new MyFrame( NULL, -1, _T("wxEdit"), wxPoint(20,20), wxSize(500,340) ); MyFrame *frame = new MyFrame( NULL, wxID_ANY, _T("wxEdit"), wxPoint(20,20), wxSize(500,340) );
frame->Show( TRUE ); frame->Show( true );
return TRUE; return true;
} }
int MyApp::OnExit() int MyApp::OnExit()