Allow displaying Japanese character with wxMotif/ANSI under a

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

diff --git a/samples/dragimag/dragimag.cpp b/samples/dragimag/dragimag.cpp
index f1c9764ac6d77f12e483271e5a8f0e92f4583712..8b5be97a0fd892e211cd11779a0822ad349e5240 100644 (file)
--- a/samples/dragimag/dragimag.cpp
+++ b/samples/dragimag/dragimag.cpp
@@ -91,7 +91,7 @@ void MyCanvas::OnEraseBackground(wxEraseEvent& event)
     {
         wxSize sz = GetClientSize();
         wxRect rect(0, 0, sz.x, sz.y);
     {
         wxSize sz = GetClientSize();
         wxRect rect(0, 0, sz.x, sz.y);

-        
+

         if (event.GetDC())
         {
             wxGetApp().TileBitmap(rect, *(event.GetDC()), wxGetApp().GetBackgroundBitmap());
         if (event.GetDC())
         {
             wxGetApp().TileBitmap(rect, *(event.GetDC()), wxGetApp().GetBackgroundBitmap());


@@ -143,7 +143,7 @@ void MyCanvas::OnMouseEvent(wxMouseEvent& event)
         {
             m_currentlyHighlighted->Draw(dc);
         }
         {
             m_currentlyHighlighted->Draw(dc);
         }

-        m_draggedShape->SetShow(TRUE);
+        m_draggedShape->SetShow(true);

         m_draggedShape->Draw(dc);
 
         m_currentlyHighlighted = (DragShape*) NULL;
         m_draggedShape->Draw(dc);
 
         m_currentlyHighlighted = (DragShape*) NULL;


@@ -169,7 +169,7 @@ void MyCanvas::OnMouseEvent(wxMouseEvent& event)
                 delete m_dragImage;
 
             // Erase the dragged shape from the canvas
                 delete m_dragImage;
 
             // Erase the dragged shape from the canvas

-            m_draggedShape->SetShow(FALSE);
+            m_draggedShape->SetShow(false);

             wxClientDC dc(this);
             EraseShape(m_draggedShape, dc);
             DrawShapes(dc);
             wxClientDC dc(this);
             EraseShape(m_draggedShape, dc);
             DrawShapes(dc);


@@ -188,15 +188,7 @@ void MyCanvas::OnMouseEvent(wxMouseEvent& event)
                 }
                 case SHAPE_DRAG_ICON:
                 {
                 }
                 case SHAPE_DRAG_ICON:
                 {

-                    // Can anyone explain why this test is necessary,
-                    // to prevent a gcc error?
-#if defined(__WXMOTIF__) || defined(__WXX11__)
-                    wxIcon icon(dragicon_xpm);
-#else
-                    wxIcon icon(wxICON(dragicon));
-#endif
-                    
-                    m_dragImage = new wxDragImage(icon, wxCursor(wxCURSOR_HAND));
+                    m_dragImage = new wxDragImage(wxICON(dragicon), wxCursor(wxCURSOR_HAND));

                     break;
                 }
             }
                     break;
                 }
             }


@@ -205,19 +197,19 @@ void MyCanvas::OnMouseEvent(wxMouseEvent& event)
 
             // The offset between the top-left of the shape image and the current shape position
             wxPoint beginDragHotSpot = m_dragStartPos - m_draggedShape->GetPosition();
 
             // The offset between the top-left of the shape image and the current shape position
             wxPoint beginDragHotSpot = m_dragStartPos - m_draggedShape->GetPosition();

-            
+

             // Now we do this inside the implementation: always assume
             // coordinates relative to the capture window (client coordinates)
 
             //if (fullScreen)
             //    beginDragHotSpot -= ClientToScreen(wxPoint(0, 0));
             // Now we do this inside the implementation: always assume
             // coordinates relative to the capture window (client coordinates)
 
             //if (fullScreen)
             //    beginDragHotSpot -= ClientToScreen(wxPoint(0, 0));

-            
+

             if (!m_dragImage->BeginDrag(beginDragHotSpot, this, fullScreen))
             {
                 delete m_dragImage;
                 m_dragImage = (wxDragImage*) NULL;
                 m_dragMode = TEST_DRAG_NONE;
             if (!m_dragImage->BeginDrag(beginDragHotSpot, this, fullScreen))
             {
                 delete m_dragImage;
                 m_dragImage = (wxDragImage*) NULL;
                 m_dragMode = TEST_DRAG_NONE;

-                
+

             } else
             {
                 m_dragImage->Move(event.GetPosition());
             } else
             {
                 m_dragImage->Move(event.GetPosition());


@@ -229,17 +221,17 @@ void MyCanvas::OnMouseEvent(wxMouseEvent& event)
             // We're currently dragging. See if we're over another shape.
             DragShape* onShape = FindShape(event.GetPosition());
 
             // We're currently dragging. See if we're over another shape.
             DragShape* onShape = FindShape(event.GetPosition());
 

-            bool mustUnhighlightOld = FALSE;
-            bool mustHighlightNew = FALSE;
+            bool mustUnhighlightOld = false;
+            bool mustHighlightNew = false;

 
             if (m_currentlyHighlighted)
             {
                 if ((onShape == (DragShape*) NULL) || (m_currentlyHighlighted != onShape))
 
             if (m_currentlyHighlighted)
             {
                 if ((onShape == (DragShape*) NULL) || (m_currentlyHighlighted != onShape))

-                    mustUnhighlightOld = TRUE;
+                    mustUnhighlightOld = true;

             }
 
             if (onShape && (onShape != m_currentlyHighlighted) && onShape->IsShown())
             }
 
             if (onShape && (onShape != m_currentlyHighlighted) && onShape->IsShown())

-                mustHighlightNew = TRUE;
+                mustHighlightNew = true;

 
             if (mustUnhighlightOld || mustHighlightNew)
                 m_dragImage->Hide();
 
             if (mustUnhighlightOld || mustHighlightNew)
                 m_dragImage->Hide();


@@ -270,7 +262,7 @@ void MyCanvas::OnMouseEvent(wxMouseEvent& event)
 
 void MyCanvas::DrawShapes(wxDC& dc)
 {
 
 void MyCanvas::DrawShapes(wxDC& dc)
 {

-    wxNode* node = m_displayList.GetFirst();
+    wxList::compatibility_iterator node = m_displayList.GetFirst();

     while (node)
     {
         DragShape* shape = (DragShape*) node->GetData();
     while (node)
     {
         DragShape* shape = (DragShape*) node->GetData();


@@ -287,7 +279,7 @@ void MyCanvas::EraseShape(DragShape* shape, wxDC& dc)
 
     wxRect rect2(shape->GetRect());
     dc.SetClippingRegion(rect2.x, rect2.y, rect2.width, rect2.height);
 
     wxRect rect2(shape->GetRect());
     dc.SetClippingRegion(rect2.x, rect2.y, rect2.width, rect2.height);

-        
+

     wxGetApp().TileBitmap(rect, dc, wxGetApp().GetBackgroundBitmap());
 
     dc.DestroyClippingRegion();
     wxGetApp().TileBitmap(rect, dc, wxGetApp().GetBackgroundBitmap());
 
     dc.DestroyClippingRegion();


@@ -295,7 +287,7 @@ void MyCanvas::EraseShape(DragShape* shape, wxDC& dc)
 
 void MyCanvas::ClearShapes()
 {
 
 void MyCanvas::ClearShapes()
 {

-    wxNode* node = m_displayList.GetFirst();
+    wxList::compatibility_iterator node = m_displayList.GetFirst();

     while (node)
     {
         DragShape* shape = (DragShape*) node->GetData();
     while (node)
     {
         DragShape* shape = (DragShape*) node->GetData();


@@ -307,7 +299,7 @@ void MyCanvas::ClearShapes()
 
 DragShape* MyCanvas::FindShape(const wxPoint& pt) const
 {
 
 DragShape* MyCanvas::FindShape(const wxPoint& pt) const
 {

-    wxNode* node = m_displayList.GetFirst();
+    wxList::compatibility_iterator node = m_displayList.GetFirst();

     while (node)
     {
         DragShape* shape = (DragShape*) node->GetData();
     while (node)
     {
         DragShape* shape = (DragShape*) node->GetData();


@@ -327,37 +319,39 @@ BEGIN_EVENT_TABLE(MyFrame,wxFrame)
 END_EVENT_TABLE()
 
 MyFrame::MyFrame()
 END_EVENT_TABLE()
 
 MyFrame::MyFrame()

-: wxFrame( (wxFrame *)NULL, -1, _T("wxDragImage sample"),
+: wxFrame( (wxFrame *)NULL, wxID_ANY, _T("wxDragImage sample"),

           wxPoint(20,20), wxSize(470,360) )
 {
     wxMenu *file_menu = new wxMenu();
     file_menu->Append( wxID_ABOUT, _T("&About..."));
           wxPoint(20,20), wxSize(470,360) )
 {
     wxMenu *file_menu = new wxMenu();
     file_menu->Append( wxID_ABOUT, _T("&About..."));

-    file_menu->Append( TEST_USE_SCREEN, _T("&Use whole screen for dragging"), _T("Use whole screen"), TRUE);
+    file_menu->AppendCheckItem( TEST_USE_SCREEN, _T("&Use whole screen for dragging"), _T("Use whole screen"));

     file_menu->Append( wxID_EXIT, _T("E&xit"));
     file_menu->Append( wxID_EXIT, _T("E&xit"));

-    
+

     wxMenuBar *menu_bar = new wxMenuBar();
     menu_bar->Append(file_menu, _T("&File"));
 
     SetIcon(wxICON(mondrian));
     SetMenuBar( menu_bar );
     wxMenuBar *menu_bar = new wxMenuBar();
     menu_bar->Append(file_menu, _T("&File"));
 
     SetIcon(wxICON(mondrian));
     SetMenuBar( menu_bar );

-    
+
+#if wxUSE_STATUSBAR

     CreateStatusBar(2);
     int widths[] = { -1, 100 };
     SetStatusWidths( 2, widths );
     CreateStatusBar(2);
     int widths[] = { -1, 100 };
     SetStatusWidths( 2, widths );

-    
-    m_canvas = new MyCanvas( this, -1, wxPoint(0,0), wxSize(10,10) );
+#endif // wxUSE_STATUSBAR
+
+    m_canvas = new MyCanvas( this, wxID_ANY, wxPoint(0,0), wxSize(10,10) );

 }
 
 void MyFrame::OnQuit( wxCommandEvent &WXUNUSED(event) )
 {
 }
 
 void MyFrame::OnQuit( wxCommandEvent &WXUNUSED(event) )
 {

-    Close( TRUE );
+    Close( true );

 }
 
 void MyFrame::OnAbout( wxCommandEvent &WXUNUSED(event) )
 {
     (void)wxMessageBox( _T("wxDragImage demo\n")
         _T("Julian Smart (c) 2000"),
 }
 
 void MyFrame::OnAbout( wxCommandEvent &WXUNUSED(event) )
 {
     (void)wxMessageBox( _T("wxDragImage demo\n")
         _T("Julian Smart (c) 2000"),

-        _T("About wxDragImage Demo"), 
+        _T("About wxDragImage Demo"),

         wxICON_INFORMATION | wxOK );
 }
 
         wxICON_INFORMATION | wxOK );
 }
 


@@ -372,7 +366,7 @@ END_EVENT_TABLE()
 MyApp::MyApp()
 {
     // Drag across whole screen
 MyApp::MyApp()
 {
     // Drag across whole screen

-    m_useScreen = FALSE;
+    m_useScreen = false;

 }
 
 bool MyApp::OnInit()
 }
 
 bool MyApp::OnInit()


@@ -431,9 +425,9 @@ bool MyApp::OnInit()
     m_background = bitmap;
 #endif
 
     m_background = bitmap;
 #endif
 

-    frame->Show( TRUE );
+    frame->Show( true );

 
 

-    return TRUE;
+    return true;

 }
 
 int MyApp::OnExit()
 }
 
 int MyApp::OnExit()


@@ -445,17 +439,17 @@ bool MyApp::TileBitmap(const wxRect& rect, wxDC& dc, wxBitmap& bitmap)
 {
     int w = bitmap.GetWidth();
     int h = bitmap.GetHeight();
 {
     int w = bitmap.GetWidth();
     int h = bitmap.GetHeight();

-    
+

     int i, j;
     for (i = rect.x; i < rect.x + rect.width; i += w)
     {
         for (j = rect.y; j < rect.y + rect.height; j+= h)
             dc.DrawBitmap(bitmap, i, j);
     }
     int i, j;
     for (i = rect.x; i < rect.x + rect.width; i += w)
     {
         for (j = rect.y; j < rect.y + rect.height; j+= h)
             dc.DrawBitmap(bitmap, i, j);
     }

-    return TRUE;
+    return true;

 }
 
 }
 

-void MyApp::OnUseScreen(wxCommandEvent& event)
+void MyApp::OnUseScreen(wxCommandEvent& WXUNUSED(event))

 {
     m_useScreen = !m_useScreen;
 }
 {
     m_useScreen = !m_useScreen;
 }


@@ -468,11 +462,7 @@ DragShape::DragShape(const wxBitmap& bitmap)
     m_pos.x = 0;
     m_pos.y = 0;
     m_dragMethod = SHAPE_DRAG_BITMAP;
     m_pos.x = 0;
     m_pos.y = 0;
     m_dragMethod = SHAPE_DRAG_BITMAP;

-    m_show = TRUE;
-}
-
-DragShape::~DragShape()
-{
+    m_show = true;

 }
 
 bool DragShape::HitTest(const wxPoint& pt) const
 }
 
 bool DragShape::HitTest(const wxPoint& pt) const


@@ -487,13 +477,13 @@ bool DragShape::Draw(wxDC& dc, int op)
     {
         wxMemoryDC memDC;
         memDC.SelectObject(m_bitmap);
     {
         wxMemoryDC memDC;
         memDC.SelectObject(m_bitmap);

-    
+

         dc.Blit(m_pos.x, m_pos.y, m_bitmap.GetWidth(), m_bitmap.GetHeight(),
         dc.Blit(m_pos.x, m_pos.y, m_bitmap.GetWidth(), m_bitmap.GetHeight(),

-            & memDC, 0, 0, op, TRUE);
+            & memDC, 0, 0, op, true);

 
 

-        return TRUE;
+        return true;

     }
     else
     }
     else

-        return FALSE;
+        return false;

 }
 
 }