#define USE_METAFILES
#endif // Windows
+#define USE_RESOURCES 0
+#if !wxUSE_RESOURCES
+#undef USE_RESOURCES
+#define USE_RESOURCES 0
+#endif
+
#include "wx/intl.h"
#include "wx/log.h"
#include "wx/image.h"
#include "wx/clipbrd.h"
#include "wx/colordlg.h"
-#include "wx/resource.h"
+#if USE_RESOURCES
+ #include "wx/resource.h"
+#else
+ #include "wx/sizer.h"
+#endif
#ifdef USE_METAFILES
#include "wx/metafile.h"
#endif // Windows
-#if defined(__WXGTK__) || defined(__WXMOTIF__)
+#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__)
#include "mondrian.xpm"
#include "dnd_copy.xpm"
// Define a custom dtop target accepting URLs
// ----------------------------------------------------------------------------
-class WXDLLEXPORT URLDropTarget : public wxDropTarget
+class URLDropTarget : public wxDropTarget
{
public:
URLDropTarget() { SetDataObject(new wxURLDataObject); }
// URLs can't be moved, only copied
virtual wxDragResult OnDragOver(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y),
wxDragResult def)
- { return def == wxDragMove ? wxDragCopy : def; }
+ {
+ return wxDragLink; // At least IE 5.x needs wxDragLink, the
+ // other browsers on MSW seem okay with it too.
+ }
// translate this to calls to OnDropURL() just for convenience
virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def)
~DnDFrame();
void OnPaint(wxPaintEvent& event);
+ void OnSize(wxSizeEvent& event);
void OnQuit (wxCommandEvent& event);
void OnAbout(wxCommandEvent& event);
void OnDrag (wxCommandEvent& event);
const wxColour& col)
: DnDShape(pos, size, col)
{
- wxLogMessage("DnDTriangularShape is being created");
+ wxLogMessage(wxT("DnDTriangularShape is being created"));
}
virtual ~DnDTriangularShape()
{
- wxLogMessage("DnDTriangularShape is being deleted");
+ wxLogMessage(wxT("DnDTriangularShape is being deleted"));
}
virtual Kind GetKind() const { return Triangle; }
const wxColour& col)
: DnDShape(pos, size, col)
{
- wxLogMessage("DnDRectangularShape is being created");
+ wxLogMessage(wxT("DnDRectangularShape is being created"));
}
virtual ~DnDRectangularShape()
{
- wxLogMessage("DnDRectangularShape is being deleted");
+ wxLogMessage(wxT("DnDRectangularShape is being deleted"));
}
virtual Kind GetKind() const { return Rectangle; }
const wxColour& col)
: DnDShape(pos, size, col)
{
- wxLogMessage("DnDEllipticShape is being created");
+ wxLogMessage(wxT("DnDEllipticShape is being created"));
}
virtual ~DnDEllipticShape()
{
- wxLogMessage("DnDEllipticShape is being deleted");
+ wxLogMessage(wxT("DnDEllipticShape is being deleted"));
}
virtual Kind GetKind() const { return Ellipse; }
// A wxDataObject specialisation for the application-specific data
// ----------------------------------------------------------------------------
-static const char *shapeFormatId = "wxShape";
+static const wxChar *shapeFormatId = wxT("wxShape");
class DnDShapeDataObject : public wxDataObject
{
else
{
wxASSERT_MSG( m_dobjBitmap.IsSupported(format),
- "unexpected format" );
+ wxT("unexpected format") );
if ( !m_hasBitmap )
CreateBitmap();
else
{
wxASSERT_MSG( m_dobjBitmap.IsSupported(format),
- "unexpected format" );
+ wxT("unexpected format") );
if ( !m_hasBitmap )
CreateBitmap();
virtual bool SetData(const wxDataFormat& format,
size_t len, const void *buf)
{
- wxCHECK_MSG( format == m_formatShape, FALSE, "unsupported format" );
+ wxCHECK_MSG( format == m_formatShape, FALSE,
+ wxT( "unsupported format") );
delete m_shape;
m_shape = DnDShape::New(buf);
{
if ( !GetData() )
{
- wxLogError("Failed to get drag and drop data");
+ wxLogError(wxT("Failed to get drag and drop data"));
return wxDragNone;
}
EVT_LEFT_DOWN( DnDFrame::OnLeftDown)
EVT_RIGHT_DOWN( DnDFrame::OnRightDown)
EVT_PAINT( DnDFrame::OnPaint)
+ EVT_SIZE( DnDFrame::OnSize)
END_EVENT_TABLE()
BEGIN_EVENT_TABLE(DnDShapeFrame, wxFrame)
// `Main program' equivalent, creating windows and returning main app frame
bool DnDApp::OnInit()
{
+#if USE_RESOURCES
// load our ressources
wxPathList pathList;
pathList.Add(".");
wxString path = pathList.FindValidPath("dnd.wxr");
if ( !path )
{
- wxLogError("Can't find the resource file dnd.wxr in the current "
- "directory, aborting.");
+ wxLogError(wxT("Can't find the resource file dnd.wxr in the current ")
+ wxT("directory, aborting."));
return FALSE;
}
wxDefaultResourceTable->ParseResourceFile(path);
+#endif
// switch on trace messages
#if defined(__WXGTK__)
help_menu->Append(Menu_About, "&About");
wxMenu *clip_menu = new wxMenu;
- clip_menu->Append(Menu_Copy, "&Copy text\tCtrl+C");
- clip_menu->Append(Menu_Paste, "&Paste text\tCtrl+V");
+ clip_menu->Append(Menu_Copy, "&Copy text\tCtrl-C");
+ clip_menu->Append(Menu_Paste, "&Paste text\tCtrl-V");
clip_menu->AppendSeparator();
- clip_menu->Append(Menu_CopyBitmap, "Copy &bitmap\tAlt+C");
- clip_menu->Append(Menu_PasteBitmap, "Paste b&itmap\tAlt+V");
+ clip_menu->Append(Menu_CopyBitmap, "Copy &bitmap\tCtrl-Shift-C");
+ clip_menu->Append(Menu_PasteBitmap, "Paste b&itmap\tCtrl-Shift-V");
#ifdef USE_METAFILES
clip_menu->AppendSeparator();
clip_menu->Append(Menu_PasteMFile, "Paste &metafile\tCtrl-M");
#endif // USE_METAFILES
clip_menu->AppendSeparator();
- clip_menu->Append(Menu_CopyFiles, "Copy &files\tCtrl+F");
+ clip_menu->Append(Menu_CopyFiles, "Copy &files\tCtrl-F");
wxMenuBar *menu_bar = new wxMenuBar;
menu_bar->Append(file_menu, "&File");
Close(TRUE);
}
+void DnDFrame::OnSize(wxSizeEvent& event)
+{
+ Refresh();
+
+ event.Skip();
+}
+
void DnDFrame::OnPaint(wxPaintEvent& WXUNUSED(event))
{
int w = 0;
GetClientSize( &w, &h );
wxPaintDC dc(this);
+ dc.Clear();
dc.SetFont( wxFont( 24, wxDECORATIVE, wxNORMAL, wxNORMAL, FALSE, "charter" ) );
dc.DrawText( "Drag text from here!", 100, h-50 );
}
{
(new DnDShapeFrame(this))->Show(TRUE);
- wxLogStatus(this, "Double click the new frame to select a shape for it");
+ wxLogStatus(this, wxT("Double click the new frame to select a shape for it"));
}
void DnDFrame::OnDrag(wxCommandEvent& WXUNUSED(event))
wxLogStatus( _T("Decoding image file...") );
wxYield();
- wxBitmap bitmap( image.ConvertToBitmap() );
+ wxBitmap bitmap( image );
if ( !wxTheClipboard->Open() )
{
wxClipboardLocker locker;
if ( !locker )
{
- wxLogError("Can't open clipboard");
+ wxLogError(wxT("Can't open clipboard"));
}
else
{
if ( !wxTheClipboard->AddData(dobj) )
{
- wxLogError("Can't copy file(s) to the clipboard");
+ wxLogError(wxT("Can't copy file(s) to the clipboard"));
}
else
{
- wxLogStatus(this, "%d file%s copied to the clipboard",
- count, count == 1 ? "" : "s");
+ wxLogStatus(this, wxT("%d file%s copied to the clipboard"),
+ count, count == 1 ? wxT("") : wxT("s"));
}
}
}
else
{
- wxLogStatus(this, "Aborted");
+ wxLogStatus(this, wxT("Aborted"));
}
#else // !MSW
- wxLogError("Sorry, not implemented");
+ wxLogError(wxT("Sorry, not implemented"));
#endif // MSW/!MSW
}
// ----------------------------------------------------------------------------
DnDShapeDialog::DnDShapeDialog(wxFrame *parent, DnDShape *shape)
+#if !USE_RESOURCES
+ :wxDialog( parent, 6001, wxT("Choose Shape"), wxPoint( 10, 10 ),
+ wxSize( 40, 40 ),
+ wxRAISED_BORDER|wxCAPTION|wxTHICK_FRAME|wxSYSTEM_MENU )
+#endif
{
m_shape = shape;
-
+#if USE_RESOURCES
LoadFromResource(parent, "dialogShape");
m_textX = (wxTextCtrl *)wxFindWindowByName("textX", this);
m_textH = (wxTextCtrl *)wxFindWindowByName("textH", this);
m_radio = (wxRadioBox *)wxFindWindowByName("radio", this);
+#else
+ wxBoxSizer* topSizer = new wxBoxSizer( wxVERTICAL );
+
+ // radio box
+ wxBoxSizer* shapesSizer = new wxBoxSizer( wxHORIZONTAL );
+ const wxString choices[] = { wxT("None"), wxT("Triangle"),
+ wxT("Rectangle"), wxT("Ellipse") };
+
+ m_radio = new wxRadioBox( this, -1, wxT("&Shape"),
+ wxDefaultPosition, wxDefaultSize, 4, choices, 4,
+ wxRA_SPECIFY_COLS );
+ shapesSizer->Add( m_radio, 0, wxGROW|wxALL, 5 );
+ topSizer->Add( shapesSizer, 0, wxALL, 2 );
+
+ // attributes
+ wxStaticBox* box = new wxStaticBox( this, -1, wxT("&Attributes") );
+ wxStaticBoxSizer* attrSizer = new wxStaticBoxSizer( box, wxHORIZONTAL );
+ wxFlexGridSizer* xywhSizer = new wxFlexGridSizer( 4, 2 );
+
+ wxStaticText* st;
+
+ st = new wxStaticText( this, -1, wxT("Position &X:") );
+ m_textX = new wxTextCtrl( this, -1, wxEmptyString, wxDefaultPosition,
+ wxSize( 30, 20 ) );
+ xywhSizer->Add( st, 1, wxGROW|wxALL, 2 );
+ xywhSizer->Add( m_textX, 1, wxGROW|wxALL, 2 );
+
+ st = new wxStaticText( this, -1, wxT("Size &width:") );
+ m_textW = new wxTextCtrl( this, -1, wxEmptyString, wxDefaultPosition,
+ wxSize( 30, 20 ) );
+ xywhSizer->Add( st, 1, wxGROW|wxALL, 2 );
+ xywhSizer->Add( m_textW, 1, wxGROW|wxALL, 2 );
+
+ st = new wxStaticText( this, -1, wxT("&Y:") );
+ m_textY = new wxTextCtrl( this, -1, wxEmptyString, wxDefaultPosition,
+ wxSize( 30, 20 ) );
+ xywhSizer->Add( st, 1, wxALL|wxALIGN_RIGHT, 2 );
+ xywhSizer->Add( m_textY, 1, wxGROW|wxALL, 2 );
+
+ st = new wxStaticText( this, -1, wxT("&height:") );
+ m_textH = new wxTextCtrl( this, -1, wxEmptyString, wxDefaultPosition,
+ wxSize( 30, 20 ) );
+ xywhSizer->Add( st, 1, wxALL|wxALIGN_RIGHT, 2 );
+ xywhSizer->Add( m_textH, 1, wxGROW|wxALL, 2 );
+
+ wxButton* col = new wxButton( this, Button_Colour, wxT("&Colour...") );
+ attrSizer->Add( xywhSizer, 1, wxGROW );
+ attrSizer->Add( col, 0, wxALL|wxALIGN_CENTRE_VERTICAL, 2 );
+ topSizer->Add( attrSizer, 0, wxGROW|wxALL, 5 );
+
+ // buttons
+ wxBoxSizer* buttonSizer = new wxBoxSizer( wxHORIZONTAL );
+ wxButton* bt;
+ bt = new wxButton( this, wxID_OK, wxT("Ok") );
+ buttonSizer->Add( bt, 0, wxALL, 2 );
+ bt = new wxButton( this, wxID_CANCEL, wxT("Cancel") );
+ buttonSizer->Add( bt, 0, wxALL, 2 );
+ topSizer->Add( buttonSizer, 0, wxALL|wxALIGN_RIGHT, 2 );
+
+ SetAutoLayout( TRUE );
+ SetSizer( topSizer );
+ topSizer->Fit( this );
+#endif
}
DnDShape *DnDShapeDialog::GetShape() const
{
m_shapeKind = (DnDShape::Kind)m_radio->GetSelection();
- m_pos.x = atoi(m_textX->GetValue());
- m_pos.y = atoi(m_textY->GetValue());
- m_size.x = atoi(m_textW->GetValue());
- m_size.y = atoi(m_textH->GetValue());
+ m_pos.x = wxAtoi(m_textX->GetValue());
+ m_pos.y = wxAtoi(m_textY->GetValue());
+ m_size.x = wxAtoi(m_textW->GetValue());
+ m_size.y = wxAtoi(m_textH->GetValue());
if ( !m_pos.x || !m_pos.y || !m_size.x || !m_size.y )
{
{
default:
case wxDragError:
- wxLogError("An error occured during drag and drop operation");
+ wxLogError(wxT("An error occured during drag and drop operation"));
break;
case wxDragNone:
wxPoint pt(x, y);
wxString s;
- s.Printf("Shape dropped at (%ld, %ld)", pt.x, pt.y);
+ s.Printf(wxT("Shape dropped at (%ld, %ld)"), pt.x, pt.y);
SetStatusText(s);
shape->Move(pt);
wxClipboardLocker clipLocker;
if ( !clipLocker )
{
- wxLogError("Can't open the clipboard");
+ wxLogError(wxT("Can't open the clipboard"));
return;
}
wxClipboardLocker clipLocker;
if ( !clipLocker )
{
- wxLogError("Can't open the clipboard");
+ wxLogError(wxT("Can't open the clipboard"));
return;
}
}
else
{
- wxLogStatus("No shape on the clipboard");
+ wxLogStatus(wxT("No shape on the clipboard"));
}
}
wxColour(dump.r, dump.g, dump.b));
default:
- wxFAIL_MSG("invalid shape!");
+ wxFAIL_MSG(wxT("invalid shape!"));
return NULL;
}
}
wxBitmap bitmap(x, y);
wxMemoryDC dc;
dc.SelectObject(bitmap);
- dc.SetBrush(wxBrush("white", wxSOLID));
+ dc.SetBrush(wxBrush(wxT("white"), wxSOLID));
dc.Clear();
m_shape->Draw(dc);
dc.SelectObject(wxNullBitmap);
projects / wxWidgets.git / blobdiff