X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/444ad3a71961ee9b131bfc4a8f99d0c53fd79093..bd73ba41f93a040ecf9c18040d7f788992d0a6ec:/samples/dnd/dnd.cpp diff --git a/samples/dnd/dnd.cpp b/samples/dnd/dnd.cpp index 4f5f76d60e..164dd9c712 100644 --- a/samples/dnd/dnd.cpp +++ b/samples/dnd/dnd.cpp @@ -29,6 +29,12 @@ #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" @@ -38,7 +44,11 @@ #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" @@ -84,7 +94,7 @@ private: // Define a custom dtop target accepting URLs // ---------------------------------------------------------------------------- -class WXDLLEXPORT URLDropTarget : public wxDropTarget +class URLDropTarget : public wxDropTarget { public: URLDropTarget() { SetDataObject(new wxURLDataObject); } @@ -342,12 +352,12 @@ public: 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; } @@ -379,12 +389,12 @@ public: 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; } @@ -416,12 +426,12 @@ public: 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; } @@ -441,7 +451,7 @@ public: // A wxDataObject specialisation for the application-specific data // ---------------------------------------------------------------------------- -static const char *shapeFormatId = "wxShape"; +static const wxChar *shapeFormatId = wxT("wxShape"); class DnDShapeDataObject : public wxDataObject { @@ -560,7 +570,7 @@ public: else { wxASSERT_MSG( m_dobjBitmap.IsSupported(format), - "unexpected format" ); + wxT("unexpected format") ); if ( !m_hasBitmap ) CreateBitmap(); @@ -589,7 +599,7 @@ public: else { wxASSERT_MSG( m_dobjBitmap.IsSupported(format), - "unexpected format" ); + wxT("unexpected format") ); if ( !m_hasBitmap ) CreateBitmap(); @@ -601,7 +611,8 @@ public: 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); @@ -729,7 +740,7 @@ public: { if ( !GetData() ) { - wxLogError("Failed to get drag and drop data"); + wxLogError(wxT("Failed to get drag and drop data")); return wxDragNone; } @@ -841,6 +852,7 @@ END_EVENT_TABLE() // `Main program' equivalent, creating windows and returning main app frame bool DnDApp::OnInit() { +#if USE_RESOURCES // load our ressources wxPathList pathList; pathList.Add("."); @@ -852,13 +864,14 @@ bool DnDApp::OnInit() 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__) @@ -1030,7 +1043,7 @@ void DnDFrame::OnNewFrame(wxCommandEvent& WXUNUSED(event)) { (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)) @@ -1316,27 +1329,27 @@ void DnDFrame::OnCopyFiles(wxCommandEvent& WXUNUSED(event)) 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 } @@ -1425,9 +1438,14 @@ bool DnDFile::OnDropFiles(wxCoord, wxCoord, const wxArrayString& filenames) // ---------------------------------------------------------------------------- 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); @@ -1436,6 +1454,69 @@ DnDShapeDialog::DnDShapeDialog(wxFrame *parent, DnDShape *shape) 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 @@ -1479,10 +1560,10 @@ bool DnDShapeDialog::TransferDataFromWindow() { 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 ) { @@ -1582,7 +1663,7 @@ void DnDShapeFrame::OnDrag(wxMouseEvent& event) { 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: @@ -1621,7 +1702,7 @@ void DnDShapeFrame::OnDrop(wxCoord x, wxCoord y, DnDShape *shape) 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); @@ -1661,7 +1742,7 @@ void DnDShapeFrame::OnCopyShape(wxCommandEvent& event) wxClipboardLocker clipLocker; if ( !clipLocker ) { - wxLogError("Can't open the clipboard"); + wxLogError(wxT("Can't open the clipboard")); return; } @@ -1675,7 +1756,7 @@ void DnDShapeFrame::OnPasteShape(wxCommandEvent& event) wxClipboardLocker clipLocker; if ( !clipLocker ) { - wxLogError("Can't open the clipboard"); + wxLogError(wxT("Can't open the clipboard")); return; } @@ -1687,7 +1768,7 @@ void DnDShapeFrame::OnPasteShape(wxCommandEvent& event) } else { - wxLogStatus("No shape on the clipboard"); + wxLogStatus(wxT("No shape on the clipboard")); } } @@ -1740,7 +1821,7 @@ DnDShape *DnDShape::New(const void *buf) wxColour(dump.r, dump.g, dump.b)); default: - wxFAIL_MSG("invalid shape!"); + wxFAIL_MSG(wxT("invalid shape!")); return NULL; } }