warning fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49887 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/artprov/artbrows.h b/samples/artprov/artbrows.h
index 329459927faf376a273e6173d0a99a629af0802e..199a31fa40028fbac2f88ff61fa73e393568dd97 100644 (file)
--- a/samples/artprov/artbrows.h
+++ b/samples/artprov/artbrows.h
@@ -15,9 +15,9 @@
 #include "wx/dialog.h"
 #include "wx/artprov.h"
 
-class WXDLLEXPORT wxListCtrl;
-class WXDLLEXPORT wxListEvent;
-class WXDLLEXPORT wxStaticBitmap;
+class WXDLLIMPEXP_FWD_CORE wxListCtrl;
+class WXDLLIMPEXP_FWD_CORE wxListEvent;
+class WXDLLIMPEXP_FWD_CORE wxStaticBitmap;
 
 class wxArtBrowserDialog : public wxDialog
 {
@@ -30,7 +30,7 @@ public:
 private:
     void OnSelectItem(wxListEvent &event);
     void OnChooseClient(wxCommandEvent &event);
-    
+
     wxListCtrl *m_list;
     wxStaticBitmap *m_canvas;
     wxStaticText *m_text;

diff --git a/samples/typetest/typetest.cpp b/samples/typetest/typetest.cpp
index 2dffb5f4176deeca458dbcf73bcafa9c37d17f56..4b5906cecd140aebc16fb7b61fe16bbda2cc2abe 100644 (file)
--- a/samples/typetest/typetest.cpp
+++ b/samples/typetest/typetest.cpp
@@ -922,12 +922,12 @@ void MyApp::DoMIMEDemo(wxCommandEvent& WXUNUSED(event))
                                _T("XyZ %s"),
                                _T("XyZ -p %s"),
                                _T("The one and only XYZ format file"),
-                               _T("xyz"), _T("123"), NULL),
+                               _T("xyz"), _T("123"), wxNullPtr),
                 wxFileTypeInfo(_T("text/html"),
                                _T("lynx %s"),
                                _T("lynx -dump %s | lpr"),
                                _T("HTML document (from fallback)"),
-                               _T("htm"), _T("html"), NULL),
+                               _T("htm"), _T("html"), wxNullPtr),
 
                 // must terminate the table with this!
                 wxFileTypeInfo()