Changed __GTK__, __WINDOWS__ and __MOTIF__ to __WXGTK__, __WXMSW__ and __WXMOTIF__

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@224 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Karsten Ballüder
1998-07-10 14:15:17 +00:00
parent 7007fcfced
commit 2049ba38ad
154 changed files with 481 additions and 463 deletions

View File

@@ -31,7 +31,7 @@
#include <wx/fontdlg.h>
#include <wx/choicdlg.h>
#if !defined(__WINDOWS__) || USE_GENERIC_DIALOGS_IN_MSW
#if !defined(__WXMSW__) || USE_GENERIC_DIALOGS_IN_MSW
#include <wx/generic/colrdlgg.h>
#include <wx/generic/fontdlgg.h>
#endif
@@ -60,14 +60,14 @@ bool MyApp::OnInit(void)
file_menu->Append(DIALOGS_CHOOSE_COLOUR, "&Choose colour");
#if !defined(__WINDOWS__) || USE_GENERIC_DIALOGS_IN_MSW
#if !defined(__WXMSW__) || USE_GENERIC_DIALOGS_IN_MSW
file_menu->Append(DIALOGS_CHOOSE_COLOUR_GENERIC, "Choose colour (&generic)");
#endif
file_menu->AppendSeparator();
file_menu->Append(DIALOGS_CHOOSE_FONT, "Choose &font");
#if !defined(__WINDOWS__) || USE_GENERIC_DIALOGS_IN_MSW
#if !defined(__WXMSW__) || USE_GENERIC_DIALOGS_IN_MSW
file_menu->Append(DIALOGS_CHOOSE_FONT_GENERIC, "Choose f&ont (generic)");
#endif
@@ -143,7 +143,7 @@ void MyFrame::ChooseFont(wxCommandEvent& event)
dialog->Close();
}
#if !defined(__WINDOWS__) || USE_GENERIC_DIALOGS_IN_MSW
#if !defined(__WXMSW__) || USE_GENERIC_DIALOGS_IN_MSW
void MyFrame::ChooseColourGeneric(wxCommandEvent& event)
{
wxColourData data;
@@ -286,7 +286,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_MENU(DIALOGS_FILE_OPEN, MyFrame::FileOpen)
EVT_MENU(DIALOGS_FILE_SAVE, MyFrame::FileSave)
EVT_MENU(DIALOGS_DIR_CHOOSE, MyFrame::DirChoose)
#if !defined(__WINDOWS__) || USE_GENERIC_DIALOGS_IN_MSW
#if !defined(__WXMSW__) || USE_GENERIC_DIALOGS_IN_MSW
EVT_MENU(DIALOGS_CHOOSE_COLOUR_GENERIC, MyFrame::ChooseColourGeneric)
EVT_MENU(DIALOGS_CHOOSE_FONT_GENERIC, MyFrame::ChooseFontGeneric)
#endif