Support for automatic setup.h in OS/2 with OW builds. __WXOS2__ final removal. Source cleaning.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36024 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Name: nativdlg.cpp
|
||||
// Name: samples/nativdlg/nativdlg.cpp
|
||||
// Purpose: Native Windows dialog sample
|
||||
// Author: Julian Smart
|
||||
// Modified by:
|
||||
@@ -82,7 +82,7 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
|
||||
|
||||
void MyFrame::OnTest1(wxCommandEvent& WXUNUSED(event))
|
||||
{
|
||||
#if ( defined(__WXOS2__) || defined(__WXMSW__) ) && !defined(__WXUNIVERSAL__)
|
||||
#if ( defined(__WXPM__) || defined(__WXMSW__) ) && !defined(__WXUNIVERSAL__)
|
||||
MyDialog dialog;
|
||||
if (dialog.LoadNativeDialog(this, _T("dialog1")))
|
||||
{
|
||||
@@ -108,5 +108,3 @@ void MyDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
|
||||
{
|
||||
EndModal(wxID_CANCEL);
|
||||
}
|
||||
|
||||
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Name: vscroll.cpp
|
||||
// Name: samples/vscroll/vstest.cpp
|
||||
// Purpose: VScroll wxWidgets sample
|
||||
// Author: Vadim Zeitlin
|
||||
// Modified by:
|
||||
@@ -40,7 +40,7 @@
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
// the application icon (under Windows and OS/2 it is in resources)
|
||||
#if !defined(__WXMSW__) && !defined(__WXOS2__)
|
||||
#if !defined(__WXMSW__) && !defined(__WXPM__)
|
||||
#include "../sample.xpm"
|
||||
#endif
|
||||
|
||||
|
Reference in New Issue
Block a user