removed #ifdefs that conditionally included the exact same code on Mac and non-Mac, instead of having just one copy of it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44050 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
190b93449e
commit
574d48dbe4
@ -116,16 +116,10 @@ public:
|
||||
void OnFromUnicodeSelected( wxCommandEvent& event );
|
||||
|
||||
#endif
|
||||
#if defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXPM__) || defined(__WXMGL__) || defined(__WXMOTIF__) || defined(__WXCOCOA__) || defined(__WXX11__) || defined(__WXPALMOS__)
|
||||
|
||||
/// wxEVT_UPDATE_UI event handler for wxID_OK
|
||||
void OnOkUpdate( wxUpdateUIEvent& event );
|
||||
|
||||
#endif
|
||||
#if defined(__WXMAC__)
|
||||
/// wxEVT_UPDATE_UI event handler for wxID_OK
|
||||
void OnOkUpdate( wxUpdateUIEvent& event );
|
||||
|
||||
#endif
|
||||
////@end wxSymbolPickerDialog event handler declarations
|
||||
|
||||
////@begin wxSymbolPickerDialog member function declarations
|
||||
|
@ -302,13 +302,7 @@ BEGIN_EVENT_TABLE( wxSymbolPickerDialog, wxDialog )
|
||||
EVT_COMBOBOX( ID_SYMBOLPICKERDIALOG_FROM, wxSymbolPickerDialog::OnFromUnicodeSelected )
|
||||
#endif
|
||||
|
||||
#if defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXPM__) || defined(__WXMGL__) || defined(__WXMOTIF__) || defined(__WXCOCOA__) || defined(__WXX11__) || defined(__WXPALMOS__)
|
||||
EVT_UPDATE_UI( wxID_OK, wxSymbolPickerDialog::OnOkUpdate )
|
||||
#endif
|
||||
|
||||
#if defined(__WXMAC__)
|
||||
EVT_UPDATE_UI( wxID_OK, wxSymbolPickerDialog::OnOkUpdate )
|
||||
#endif
|
||||
|
||||
////@end wxSymbolPickerDialog event table entries
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user