Use _UNICODE instead of UNICODE in wx/msw/winundef.h.

[wxWidgets.git] / samples / shaped / shaped.cpp

diff --git a/samples/shaped/shaped.cpp b/samples/shaped/shaped.cpp
index 9ebf3e697c74fb3ed4e4e02c047eb545a16172eb..6e9a0d955c60f22fe617811fb033c0d0fc144957 100644 (file)
--- a/samples/shaped/shaped.cpp
+++ b/samples/shaped/shaped.cpp
@@ -40,6 +40,9 @@
 #include "wx/dcclient.h"
 #include "wx/image.h"
 
+#ifndef __WXMSW__
+    #include "../sample.xpm"
+#endif
 
 // ----------------------------------------------------------------------------
 // constants
@@ -178,6 +181,7 @@ private:
     {
         static const char *names[] =
         {
+            "none",
             "roll to left",
             "roll to right",
             "roll to top",
@@ -246,6 +250,8 @@ MainFrame::MainFrame()
          : wxFrame(NULL, wxID_ANY, "wxWidgets Shaped Sample",
                    wxDefaultPosition, wxSize(200, 100))
 {
+    SetIcon(wxICON(sample));
+
     wxMenuBar * const mbar = new wxMenuBar;
     wxMenu * const menuFrames = new wxMenu;
     menuFrames->Append(Show_Shaped, "Show &shaped window\tCtrl-S");
@@ -341,7 +347,7 @@ void MainFrame::OnShowEffect(wxCommandEvent& event)
             return;
     }
 
-    new EffectFrame(this, eff,1000);
+    new EffectFrame(this,  eff, 1000);
 }
 
 // ----------------------------------------------------------------------------
@@ -370,7 +376,7 @@ ShapedFrame::ShapedFrame(wxFrame *parent)
             )
 {
     m_hasShape = false;
-    m_bmp = wxBitmap(_T("star.png"), wxBITMAP_TYPE_PNG);
+    m_bmp = wxBitmap(wxT("star.png"), wxBITMAP_TYPE_PNG);
     SetSize(wxSize(m_bmp.GetWidth(), m_bmp.GetHeight()));
     SetToolTip(wxT("Right-click to close"));
     SetWindowShape();