Extract compiler-specific macro definitions in a new wx/compiler.h.

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

diff --git a/samples/dragimag/dragimag.cpp b/samples/dragimag/dragimag.cpp
index cce62bcdfa16047aa339d8fd183a844a5c07cb82..3247e32e2d401f8096c2a728d9d98d9fd38c886e 100644 (file)
--- a/samples/dragimag/dragimag.cpp
+++ b/samples/dragimag/dragimag.cpp
@@ -36,7 +36,7 @@
 
 #include "dragimag.h"
 
 
 #include "dragimag.h"
 

-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../sample.xpm"
     #include "dragicon.xpm"
 #endif
     #include "../sample.xpm"
     #include "dragicon.xpm"
 #endif


@@ -87,7 +87,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
 
 void MyCanvas::OnEraseBackground(wxEraseEvent& event)
 {
 
 void MyCanvas::OnEraseBackground(wxEraseEvent& event)
 {

-    if (wxGetApp().GetBackgroundBitmap().Ok())
+    if (wxGetApp().GetBackgroundBitmap().IsOk())

     {
         wxSize sz = GetClientSize();
         wxRect rect(0, 0, sz.x, sz.y);
     {
         wxSize sz = GetClientSize();
         wxRect rect(0, 0, sz.x, sz.y);


@@ -142,7 +142,7 @@ void MyCanvas::OnMouseEvent(wxMouseEvent& event)
         m_currentlyHighlighted = (DragShape*) NULL;
 
         m_draggedShape = (DragShape*) NULL;
         m_currentlyHighlighted = (DragShape*) NULL;
 
         m_draggedShape = (DragShape*) NULL;

-        
+

         Refresh(true);
     }
     else if (event.Dragging() && m_dragMode != TEST_DRAG_NONE)
         Refresh(true);
     }
     else if (event.Dragging() && m_dragMode != TEST_DRAG_NONE)


@@ -230,7 +230,7 @@ void MyCanvas::OnMouseEvent(wxMouseEvent& event)
 
             if (mustUnhighlightOld || mustHighlightNew)
                 m_dragImage->Hide();
 
             if (mustUnhighlightOld || mustHighlightNew)
                 m_dragImage->Hide();

-            
+

             // Now with the drag image switched off, we can change the window contents.
             if (mustUnhighlightOld)
                 m_currentlyHighlighted = (DragShape*) NULL;
             // Now with the drag image switched off, we can change the window contents.
             if (mustUnhighlightOld)
                 m_currentlyHighlighted = (DragShape*) NULL;


@@ -318,7 +318,7 @@ MyFrame::MyFrame()
           wxPoint(20,20), wxSize(470,360) )
 {
     wxMenu *file_menu = new wxMenu();
           wxPoint(20,20), wxSize(470,360) )
 {
     wxMenu *file_menu = new wxMenu();

-    file_menu->Append( wxID_ABOUT, wxT("&About..."));
+    file_menu->Append( wxID_ABOUT, wxT("&About"));

     file_menu->AppendCheckItem( TEST_USE_SCREEN, wxT("&Use whole screen for dragging"), wxT("Use whole screen"));
     file_menu->Append( wxID_EXIT, wxT("E&xit"));
 
     file_menu->AppendCheckItem( TEST_USE_SCREEN, wxT("&Use whole screen for dragging"), wxT("Use whole screen"));
     file_menu->Append( wxID_EXIT, wxT("E&xit"));
 


@@ -468,14 +468,14 @@ bool DragShape::HitTest(const wxPoint& pt) const
 
 bool DragShape::Draw(wxDC& dc, bool highlight)
 {
 
 bool DragShape::Draw(wxDC& dc, bool highlight)
 {

-    if (m_bitmap.Ok())
+    if (m_bitmap.IsOk())

     {
         wxMemoryDC memDC;
         memDC.SelectObject(m_bitmap);
 
         dc.Blit(m_pos.x, m_pos.y, m_bitmap.GetWidth(), m_bitmap.GetHeight(),
             & memDC, 0, 0, wxCOPY, true);
     {
         wxMemoryDC memDC;
         memDC.SelectObject(m_bitmap);
 
         dc.Blit(m_pos.x, m_pos.y, m_bitmap.GetWidth(), m_bitmap.GetHeight(),
             & memDC, 0, 0, wxCOPY, true);

-            
+

         if (highlight)
         {
             dc.SetPen(*wxWHITE_PEN);
         if (highlight)
         {
             dc.SetPen(*wxWHITE_PEN);


@@ -498,7 +498,7 @@ bool MyDragImage::UpdateBackingFromWindow(wxDC& WXUNUSED(windowDC), wxMemoryDC&
 {
     destDC.SetClippingRegion(destRect);
 
 {
     destDC.SetClippingRegion(destRect);
 

-    if (wxGetApp().GetBackgroundBitmap().Ok())
+    if (wxGetApp().GetBackgroundBitmap().IsOk())

         wxGetApp().TileBitmap(destRect, destDC, wxGetApp().GetBackgroundBitmap());
 
     m_canvas->DrawShapes(destDC);
         wxGetApp().TileBitmap(destRect, destDC, wxGetApp().GetBackgroundBitmap());
 
     m_canvas->DrawShapes(destDC);