fix SetFocus() in wxDialog-derived class ctor (which used to be ignored); this replac...

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

diff --git a/samples/shaped/shaped.cpp b/samples/shaped/shaped.cpp
index 657c70319f54b9e499397fc02ef0645b354b3444..a79b97abbfc1d2ff8bcdf1498e701b2d3869e483 100644 (file)
--- a/samples/shaped/shaped.cpp
+++ b/samples/shaped/shaped.cpp
@@ -159,7 +159,7 @@ ShapedFrame::ShapedFrame()
             )
 {
     m_hasShape = FALSE;
             )
 {
     m_hasShape = FALSE;

-    m_bmp = wxBitmap("star.png", wxBITMAP_TYPE_PNG);
+    m_bmp = wxBitmap(_T("star.png"), wxBITMAP_TYPE_PNG);

     SetSize(wxSize(m_bmp.GetWidth(), m_bmp.GetHeight()));
 #ifndef __WXMAC__
     // On wxMac the tooltip gets clipped by the window shape, YUCK!!
     SetSize(wxSize(m_bmp.GetWidth(), m_bmp.GetHeight()));
 #ifndef __WXMAC__
     // On wxMac the tooltip gets clipped by the window shape, YUCK!!


@@ -182,7 +182,7 @@ void ShapedFrame::SetWindowShape()
     m_hasShape = SetShape(region);
 }
 
     m_hasShape = SetShape(region);
 }
 

-void ShapedFrame::OnDoubleClick(wxMouseEvent& evt)
+void ShapedFrame::OnDoubleClick(wxMouseEvent& WXUNUSED(evt))

 {
     if (m_hasShape)
     {
 {
     if (m_hasShape)
     {


@@ -205,13 +205,13 @@ void ShapedFrame::OnLeftDown(wxMouseEvent& evt)
     m_delta = wxPoint(dx, dy);
 }
 
     m_delta = wxPoint(dx, dy);
 }
 

-void ShapedFrame::OnLeftUp(wxMouseEvent& evt)
+void ShapedFrame::OnLeftUp(wxMouseEvent& WXUNUSED(evt))

 {
     if (HasCapture())
     {
         ReleaseMouse();
         //printf("Mouse released\n");
 {
     if (HasCapture())
     {
         ReleaseMouse();
         //printf("Mouse released\n");

-}
+    }

 }
 
 void ShapedFrame::OnMouseMove(wxMouseEvent& evt)
 }
 
 void ShapedFrame::OnMouseMove(wxMouseEvent& evt)


@@ -225,18 +225,18 @@ void ShapedFrame::OnMouseMove(wxMouseEvent& evt)
     }
 }
 
     }
 }
 

-void ShapedFrame::OnExit(wxMouseEvent& evt)
+void ShapedFrame::OnExit(wxMouseEvent& WXUNUSED(evt))

 {
     Close();
 }
 
 {
     Close();
 }
 

-void ShapedFrame::OnPaint(wxPaintEvent& evt)
+void ShapedFrame::OnPaint(wxPaintEvent& WXUNUSED(evt))

 {
     wxPaintDC dc(this);
     dc.DrawBitmap(m_bmp, 0, 0, TRUE);
 }
 
 {
     wxPaintDC dc(this);
     dc.DrawBitmap(m_bmp, 0, 0, TRUE);
 }
 

-void ShapedFrame::OnWindowCreate(wxWindowCreateEvent& evt)
+void ShapedFrame::OnWindowCreate(wxWindowCreateEvent& WXUNUSED(evt))

 {
     SetWindowShape();
 }
 {
     SetWindowShape();
 }