// Under Windows, change this to 1
// to use wxGenericDragImage
-#define wxUSE_GENERIC_DRAGIMAGE 0
+#define wxUSE_GENERIC_DRAGIMAGE 1
#if wxUSE_GENERIC_DRAGIMAGE
#include "wx/generic/dragimgg.h"
#include "dragimag.h"
-#if defined(__WXGTK__) || defined(__WXMOTIF__)
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXX11__)
#include "mondrian.xpm"
#include "dragicon.xpm"
#endif
PrepareDC( dc );
DrawShapes(dc);
-
}
void MyCanvas::OnEraseBackground(wxEraseEvent& event)
if (!m_draggedShape || !m_dragImage)
return;
- wxPoint newPos(m_draggedShape->GetPosition().x + (event.GetPosition().x - m_dragStartPos.x),
- m_draggedShape->GetPosition().y + (event.GetPosition().y - m_dragStartPos.y));
-
- m_draggedShape->SetPosition(newPos);
+ m_draggedShape->SetPosition(m_draggedShape->GetPosition()
+ + event.GetPosition() - m_dragStartPos);
m_dragImage->Hide();
m_dragImage->EndDrag();
if (dx <= tolerance && dy <= tolerance)
return;
- wxPoint newPos(m_draggedShape->GetPosition().x + (event.GetPosition().x - m_dragStartPos.x),
- m_draggedShape->GetPosition().y + (event.GetPosition().y - m_dragStartPos.y));
-
// Start the drag.
m_dragMode = TEST_DRAG_DRAGGING;
{
case SHAPE_DRAG_BITMAP:
{
- wxPoint hotSpot(event.GetPosition().x - newPos.x, event.GetPosition().y - newPos.y);
- m_dragImage = new wxDragImage(m_draggedShape->GetBitmap(), wxCursor(wxCURSOR_HAND), hotSpot);
+ m_dragImage = new wxDragImage(m_draggedShape->GetBitmap(), wxCursor(wxCURSOR_HAND));
break;
}
case SHAPE_DRAG_TEXT:
{
- wxPoint hotSpot(event.GetPosition().x - newPos.x, event.GetPosition().y - newPos.y);
- m_dragImage = new wxDragImage("Dragging some test text", wxCursor(wxCURSOR_HAND), hotSpot);
+ m_dragImage = new wxDragImage(wxString(_T("Dragging some test text")), wxCursor(wxCURSOR_HAND));
break;
}
case SHAPE_DRAG_ICON:
{
- wxPoint hotSpot(event.GetPosition().x - newPos.x, event.GetPosition().y - newPos.y);
-
// Can anyone explain why this test is necessary,
// to prevent a gcc error?
-#ifdef __WXMOTIF__
- wxIcon icon(dragicon_xpm);
+#if defined(__WXMOTIF__) || defined(__WXX11__)
+ wxIcon icon(dragicon_xpm);
#else
- wxIcon icon(wxICON(dragicon));
+ wxIcon icon(wxICON(dragicon));
#endif
-
- m_dragImage = new wxDragImage(icon, wxCursor(wxCURSOR_HAND), hotSpot);
+
+ m_dragImage = new wxDragImage(icon, wxCursor(wxCURSOR_HAND));
break;
}
}
- bool fullScreen = FALSE;
- if (wxGetApp().GetUseScreen())
- {
- newPos = ClientToScreen(newPos);
- fullScreen = TRUE;
- }
+ bool fullScreen = wxGetApp().GetUseScreen();
- bool retValue;
+ // 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)
- // This line uses the whole screen...
- retValue = m_dragImage->BeginDrag(wxPoint(0, 0), this, TRUE);
- // while this line restricts dragging to the parent frame.
- // retValue = m_dragImage->BeginDrag(wxPoint(0, 0), this, GetParent());
- else
- retValue = m_dragImage->BeginDrag(wxPoint(0, 0), this);
-
- if (!retValue)
+ //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;
+
+ } else
+ {
+ m_dragImage->Move(event.GetPosition());
+ m_dragImage->Show();
}
- m_dragImage->Move(newPos);
- m_dragImage->Show();
}
else if (m_dragMode == TEST_DRAG_DRAGGING)
{
m_currentlyHighlighted->Draw(clientDC, wxINVERT);
}
- wxPoint newPos(m_draggedShape->GetPosition().x + (event.GetPosition().x - m_dragStartPos.x),
- m_draggedShape->GetPosition().y + (event.GetPosition().y - m_dragStartPos.y));
-
- if (wxGetApp().GetUseScreen())
- {
- newPos = ClientToScreen(newPos);
- }
-
// Move and show the image again
- m_dragImage->Move(newPos);
+ m_dragImage->Move(event.GetPosition());
if (mustUnhighlightOld || mustHighlightNew)
m_dragImage->Show();
void MyCanvas::DrawShapes(wxDC& dc)
{
- wxNode* node = m_displayList.First();
+ wxList::compatibility_iterator node = m_displayList.GetFirst();
while (node)
{
- DragShape* shape = (DragShape*) node->Data();
+ DragShape* shape = (DragShape*) node->GetData();
if (shape->IsShown())
shape->Draw(dc);
- node = node->Next();
+ node = node->GetNext();
}
}
void MyCanvas::ClearShapes()
{
- wxNode* node = m_displayList.First();
+ wxList::compatibility_iterator node = m_displayList.GetFirst();
while (node)
{
- DragShape* shape = (DragShape*) node->Data();
+ DragShape* shape = (DragShape*) node->GetData();
delete shape;
- node = node->Next();
+ node = node->GetNext();
}
m_displayList.Clear();
}
DragShape* MyCanvas::FindShape(const wxPoint& pt) const
{
- wxNode* node = m_displayList.First();
+ wxList::compatibility_iterator node = m_displayList.GetFirst();
while (node)
{
- DragShape* shape = (DragShape*) node->Data();
+ DragShape* shape = (DragShape*) node->GetData();
if (shape->HitTest(pt))
return shape;
- node = node->Next();
+ node = node->GetNext();
}
return (DragShape*) NULL;
}
// MyFrame
-
IMPLEMENT_DYNAMIC_CLASS( MyFrame, wxFrame )
BEGIN_EVENT_TABLE(MyFrame,wxFrame)
END_EVENT_TABLE()
MyFrame::MyFrame()
- : wxFrame( (wxFrame *)NULL, -1, "wxDragImage sample",
- wxPoint(20,20), wxSize(470,360) )
+: wxFrame( (wxFrame *)NULL, -1, _T("wxDragImage sample"),
+ wxPoint(20,20), wxSize(470,360) )
{
- wxMenu *file_menu = new wxMenu();
- file_menu->Append( wxID_ABOUT, "&About...");
- file_menu->Append( TEST_USE_SCREEN, "&Use whole screen for dragging", "Use whole screen", TRUE);
- file_menu->Append( wxID_EXIT, "E&xit");
-
- wxMenuBar *menu_bar = new wxMenuBar();
- menu_bar->Append(file_menu, "&File");
-
- SetMenuBar( menu_bar );
-
- CreateStatusBar(2);
- int widths[] = { -1, 100 };
- SetStatusWidths( 2, widths );
+ 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->Append( wxID_EXIT, _T("E&xit"));
+
+ wxMenuBar *menu_bar = new wxMenuBar();
+ menu_bar->Append(file_menu, _T("&File"));
- m_canvas = new MyCanvas( this, -1, wxPoint(0,0), wxSize(10,10) );
+ SetIcon(wxICON(mondrian));
+ SetMenuBar( menu_bar );
+
+ CreateStatusBar(2);
+ int widths[] = { -1, 100 };
+ SetStatusWidths( 2, widths );
+
+ m_canvas = new MyCanvas( this, -1, wxPoint(0,0), wxSize(10,10) );
}
void MyFrame::OnQuit( wxCommandEvent &WXUNUSED(event) )
{
- Close( TRUE );
+ Close( TRUE );
}
void MyFrame::OnAbout( wxCommandEvent &WXUNUSED(event) )
{
- (void)wxMessageBox( "wxDragImage demo\n"
- "Julian Smart (c) 2000",
- "About wxDragImage Demo", wxICON_INFORMATION | wxOK );
+ (void)wxMessageBox( _T("wxDragImage demo\n")
+ _T("Julian Smart (c) 2000"),
+ _T("About wxDragImage Demo"),
+ wxICON_INFORMATION | wxOK );
}
//-----------------------------------------------------------------------------
#endif
wxImage image;
- if (image.LoadFile("backgrnd.png", wxBITMAP_TYPE_PNG))
+ if (image.LoadFile(_T("backgrnd.png"), wxBITMAP_TYPE_PNG))
{
- m_background = image.ConvertToBitmap();
+ m_background = wxBitmap(image);
}
-
MyFrame *frame = new MyFrame();
- wxString rootName("shape0");
+ wxString rootName(_T("shape0"));
int i;
for (i = 1; i < 4; i++)
{
wxString filename;
- filename.Printf("%s%d.png", (const char*) rootName, i);
+ filename.Printf(wxT("%s%d.png"), (const wxChar*)rootName, i);
+ /* For some reason under wxX11, the 2nd LoadFile in this loop fails, with
+ a BadMatch inside CreateFromImage (inside ConvertToBitmap). This happens even if you copy
+ the first file over the second file. */
if (image.LoadFile(filename, wxBITMAP_TYPE_PNG))
{
- DragShape* newShape = new DragShape(image.ConvertToBitmap());
+ DragShape* newShape = new DragShape(wxBitmap(image));
newShape->SetPosition(wxPoint(i*50, i*50));
if (i == 2)
return TRUE;
}
+int MyApp::OnExit()
+{
+ return 0;
+}
+
bool MyApp::TileBitmap(const wxRect& rect, wxDC& dc, wxBitmap& bitmap)
{
int w = bitmap.GetWidth();
return TRUE;
}
-void MyApp::OnUseScreen(wxCommandEvent& event)
+void MyApp::OnUseScreen(wxCommandEvent& WXUNUSED(event))
{
m_useScreen = !m_useScreen;
}
projects / wxWidgets.git / blobdiff