wxUSE_CONFIG_NATIVE fix

[wxWidgets.git] / samples / mfc / mfctest.cpp

diff --git a/samples/mfc/mfctest.cpp b/samples/mfc/mfctest.cpp
index 740bfbbbc1585c1c434a1b17b18807ef80b684d7..91ed30dbdcc24af6c5dc5c12fbd0f534ea18f171 100644 (file)
--- a/samples/mfc/mfctest.cpp
+++ b/samples/mfc/mfctest.cpp
@@ -44,6 +44,10 @@
 
 #include "wx/wx.h"
 
 
 #include "wx/wx.h"
 

+#ifdef _WINDOWS_
+#error Sorry, you need to edit include/wx/wxprec.h, comment out the windows.h inclusion, and recompile.
+#endif
+

 #ifdef new
 #undef new
 #endif
 #ifdef new
 #undef new
 #endif


@@ -89,7 +93,6 @@ class MyChild: public wxFrame
     MyCanvas *canvas;
     MyChild(wxFrame *frame, const wxString& title, const wxPoint& pos, const wxSize& size, const long style);
     ~MyChild(void);
     MyCanvas *canvas;
     MyChild(wxFrame *frame, const wxString& title, const wxPoint& pos, const wxSize& size, const long style);
     ~MyChild(void);

-    bool OnClose(void);

 
     void OnQuit(wxCommandEvent& event);
     void OnNew(wxCommandEvent& event);
 
     void OnQuit(wxCommandEvent& event);
     void OnNew(wxCommandEvent& event);


@@ -372,12 +375,6 @@ void MyChild::OnActivate(wxActivateEvent& event)
     canvas->SetFocus();
 }
 
     canvas->SetFocus();
 }
 

-bool MyChild::OnClose(void)
-{
-  return TRUE;
-}
-
-

 // Dummy MFC window for specifying a valid main window to MFC, using
 // a wxWindows HWND.
 CDummyWindow::CDummyWindow(HWND hWnd):CWnd()
 // Dummy MFC window for specifying a valid main window to MFC, using
 // a wxWindows HWND.
 CDummyWindow::CDummyWindow(HWND hWnd):CWnd()