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

add more wxUSE_XXX checks to allow compilation with some wx features disabled (closes #10410)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58264 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-01-21 14:47:45 +00:00
parent b4c409189d
commit 81496fea46
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
samples/dialogs/dialogs.cpp
View File

@@ -148,7 +148,9 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_MENU(DIALOGS_MULTI_CHOICE, MyFrame::MultiChoice) EVT_MENU(DIALOGS_MULTI_CHOICE, MyFrame::MultiChoice)
#endif // wxUSE_CHOICEDLG #endif // wxUSE_CHOICEDLG
#if wxUSE_REARRANGECTRL
EVT_MENU(DIALOGS_REARRANGE, MyFrame::Rearrange) EVT_MENU(DIALOGS_REARRANGE, MyFrame::Rearrange)
#endif // wxUSE_REARRANGECTRL
#if wxUSE_FILEDLG #if wxUSE_FILEDLG
EVT_MENU(DIALOGS_FILE_OPEN, MyFrame::FileOpen) EVT_MENU(DIALOGS_FILE_OPEN, MyFrame::FileOpen)
@@ -174,7 +176,9 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_MENU(DIALOGS_MODELESS, MyFrame::ModelessDlg) EVT_MENU(DIALOGS_MODELESS, MyFrame::ModelessDlg)
EVT_MENU(DIALOGS_CENTRE_SCREEN, MyFrame::DlgCenteredScreen) EVT_MENU(DIALOGS_CENTRE_SCREEN, MyFrame::DlgCenteredScreen)
EVT_MENU(DIALOGS_CENTRE_PARENT, MyFrame::DlgCenteredParent) EVT_MENU(DIALOGS_CENTRE_PARENT, MyFrame::DlgCenteredParent)
#if wxUSE_MINIFRAME
EVT_MENU(DIALOGS_MINIFRAME, MyFrame::MiniFrame) EVT_MENU(DIALOGS_MINIFRAME, MyFrame::MiniFrame)
#endif // wxUSE_MINIFRAME
EVT_MENU(DIALOGS_ONTOP, MyFrame::DlgOnTop) EVT_MENU(DIALOGS_ONTOP, MyFrame::DlgOnTop)
#if wxUSE_STARTUP_TIPS #if wxUSE_STARTUP_TIPS
@@ -299,7 +303,9 @@ bool MyApp::OnInit()
choices_menu->Append(DIALOGS_MULTI_CHOICE, _T("M&ultiple choice\tCtrl-U")); choices_menu->Append(DIALOGS_MULTI_CHOICE, _T("M&ultiple choice\tCtrl-U"));
#endif // wxUSE_CHOICEDLG #endif // wxUSE_CHOICEDLG
#if wxUSE_REARRANGECTRL
choices_menu->Append(DIALOGS_REARRANGE, _T("&Rearrange dialog\tCtrl-R")); choices_menu->Append(DIALOGS_REARRANGE, _T("&Rearrange dialog\tCtrl-R"));
#endif // wxUSE_REARRANGECTRL
#if USE_COLOURDLG_GENERIC || USE_FONTDLG_GENERIC #if USE_COLOURDLG_GENERIC || USE_FONTDLG_GENERIC
choices_menu->AppendSeparator(); choices_menu->AppendSeparator();
@@ -417,7 +423,9 @@ bool MyApp::OnInit()
dialogs_menu->AppendCheckItem(DIALOGS_MODELESS, _T("Mode&less dialog\tCtrl-Z")); dialogs_menu->AppendCheckItem(DIALOGS_MODELESS, _T("Mode&less dialog\tCtrl-Z"));
dialogs_menu->Append(DIALOGS_CENTRE_SCREEN, _T("Centered on &screen\tShift-Ctrl-1")); dialogs_menu->Append(DIALOGS_CENTRE_SCREEN, _T("Centered on &screen\tShift-Ctrl-1"));
dialogs_menu->Append(DIALOGS_CENTRE_PARENT, _T("Centered on &parent\tShift-Ctrl-2")); dialogs_menu->Append(DIALOGS_CENTRE_PARENT, _T("Centered on &parent\tShift-Ctrl-2"));
#if wxUSE_MINIFRAME
dialogs_menu->Append(DIALOGS_MINIFRAME, _T("&Mini frame")); dialogs_menu->Append(DIALOGS_MINIFRAME, _T("&Mini frame"));
#endif // wxUSE_MINIFRAME
dialogs_menu->Append(DIALOGS_ONTOP, _T("Dialog staying on &top")); dialogs_menu->Append(DIALOGS_ONTOP, _T("Dialog staying on &top"));
menuDlg->Append(wxID_ANY, _T("&Generic dialogs"), dialogs_menu); menuDlg->Append(wxID_ANY, _T("&Generic dialogs"), dialogs_menu);
@@ -823,6 +831,7 @@ void MyFrame::MultiChoice(wxCommandEvent& WXUNUSED(event) )
} }
#endif // wxUSE_CHOICEDLG #endif // wxUSE_CHOICEDLG
#if wxUSE_REARRANGECTRL
// custom rearrange dialog: it adds the possibility to rename an item to the // custom rearrange dialog: it adds the possibility to rename an item to the
// base class functionality // base class functionality
class MyRearrangeDialog : public wxRearrangeDialog class MyRearrangeDialog : public wxRearrangeDialog
@@ -1047,6 +1056,7 @@ void MyFrame::Rearrange(wxCommandEvent& WXUNUSED(event))
wxLogMessage("The columns order now is:%s", columns); wxLogMessage("The columns order now is:%s", columns);
} }
#endif // wxUSE_REARRANGECTRL
#if wxUSE_FILEDLG #if wxUSE_FILEDLG
@@ -1394,6 +1404,7 @@ void MyFrame::DlgCenteredParent(wxCommandEvent& WXUNUSED(event))
dlg.ShowModal(); dlg.ShowModal();
} }
#if wxUSE_MINIFRAME
void MyFrame::MiniFrame(wxCommandEvent& WXUNUSED(event)) void MyFrame::MiniFrame(wxCommandEvent& WXUNUSED(event))
{ {
wxFrame *frame = new wxMiniFrame(this, wxID_ANY, _T("Mini frame"), wxFrame *frame = new wxMiniFrame(this, wxID_ANY, _T("Mini frame"),
@@ -1411,6 +1422,7 @@ void MyFrame::MiniFrame(wxCommandEvent& WXUNUSED(event))
frame->CentreOnParent(); frame->CentreOnParent();
frame->Show(); frame->Show();
} }
#endif // wxUSE_MINIFRAME
void MyFrame::DlgOnTop(wxCommandEvent& WXUNUSED(event)) void MyFrame::DlgOnTop(wxCommandEvent& WXUNUSED(event))
{ {
@@ -1536,12 +1548,14 @@ TestDefaultActionDialog::TestDefaultActionDialog( wxWindow *parent ) :
wxFlexGridSizer *grid_sizer = new wxFlexGridSizer( 2, 5, 5 ); wxFlexGridSizer *grid_sizer = new wxFlexGridSizer( 2, 5, 5 );
#if wxUSE_LISTBOX
wxListBox *listbox = new wxListBox( this, ID_LISTBOX ); wxListBox *listbox = new wxListBox( this, ID_LISTBOX );
listbox->Append( "String 1" ); listbox->Append( "String 1" );
listbox->Append( "String 2" ); listbox->Append( "String 2" );
listbox->Append( "String 3" ); listbox->Append( "String 3" );
listbox->Append( "String 4" ); listbox->Append( "String 4" );
grid_sizer->Add( listbox ); grid_sizer->Add( listbox );
#endif // wxUSE_LISTBOX
grid_sizer->Add( new wxCheckBox( this, ID_CATCH_LISTBOX_DCLICK, "Catch DoubleClick from wxListBox" ), 0, wxALIGN_CENTRE_VERTICAL ); grid_sizer->Add( new wxCheckBox( this, ID_CATCH_LISTBOX_DCLICK, "Catch DoubleClick from wxListBox" ), 0, wxALIGN_CENTRE_VERTICAL );