don't crash trying to dereference NULL m_selection (happens when showing a grid witho...

[wxWidgets.git] / src / generic / tipdlg.cpp

diff --git a/src/generic/tipdlg.cpp b/src/generic/tipdlg.cpp
index 417a093903a51da7469742805b08cce7c2e08518..d1ce8278e02a292d1affdb40f21bf1d65f9a3744 100644 (file)
--- a/src/generic/tipdlg.cpp
+++ b/src/generic/tipdlg.cpp
@@ -45,6 +45,7 @@
 #endif // WX_PRECOMP
 
 #include "wx/statline.h"
 #endif // WX_PRECOMP
 
 #include "wx/statline.h"

+#include "wx/artprov.h"

 
 #include "wx/tipdlg.h"
 
 
 #include "wx/tipdlg.h"
 


@@ -181,26 +182,22 @@ wxTipDialog::wxTipDialog(wxWindow *parent,
     text->SetFont(wxFont(18, wxSWISS, wxNORMAL, wxBOLD));
 #endif
 //
     text->SetFont(wxFont(18, wxSWISS, wxNORMAL, wxBOLD));
 #endif
 //

-//    text->SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_BTNFACE));
+//    text->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE));

 
     m_text = new wxTextCtrl(this, -1, wxT(""),
                             wxDefaultPosition, wxSize(200, 160),
                             wxTE_MULTILINE |
                             wxTE_READONLY |
 
     m_text = new wxTextCtrl(this, -1, wxT(""),
                             wxDefaultPosition, wxSize(200, 160),
                             wxTE_MULTILINE |
                             wxTE_READONLY |

+                            wxTE_NO_VSCROLL |

                             wxTE_RICH | // a hack to get rid of vert scrollbar
                             wxSUNKEN_BORDER);
 #if defined(__WXMSW__)
                             wxTE_RICH | // a hack to get rid of vert scrollbar
                             wxSUNKEN_BORDER);
 #if defined(__WXMSW__)

-    m_text->SetFont(wxFont(12, wxROMAN, wxNORMAL, wxNORMAL));
+    m_text->SetFont(wxFont(12, wxSWISS, wxNORMAL, wxNORMAL));

 #else
 #else

-    m_text->SetFont(wxFont(14, wxROMAN, wxNORMAL, wxNORMAL));
+    m_text->SetFont(wxFont(14, wxSWISS, wxNORMAL, wxNORMAL));

 #endif
 
 #endif
 

-#if defined(__WXMSW__) || defined(__WXPM__)
-    wxIcon icon("wxICON_TIP");
-#else
-    #include "wx/generic/tip.xpm"
-    wxIcon icon(tipIcon);
-#endif
+    wxIcon icon = wxArtProvider::GetIcon(wxART_TIP, wxART_CMN_DIALOG);

     wxStaticBitmap *bmp = new wxStaticBitmap(this, -1, icon);
 
     // 2) put them in boxes
     wxStaticBitmap *bmp = new wxStaticBitmap(this, -1, icon);
 
     // 2) put them in boxes