Incomplete wxUSE_* warning fix.

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

diff --git a/samples/dnd/dnd.cpp b/samples/dnd/dnd.cpp
index e08ee8377cbe06d6dfea90ecd765e781ab0796a3..371b2477b9c0d85be7d7ffae0fa851095cf1dc47 100644 (file)
--- a/samples/dnd/dnd.cpp
+++ b/samples/dnd/dnd.cpp
@@ -29,18 +29,20 @@
 #include "wx/clipbrd.h"
 #include "wx/colordlg.h"
 #include "wx/sizer.h"
 #include "wx/clipbrd.h"
 #include "wx/colordlg.h"
 #include "wx/sizer.h"

+#include "wx/dataobj.h"

 
 #if wxUSE_METAFILES
     #include "wx/metafile.h"
 #endif // wxUSE_METAFILES
 
 #if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__)
 
 #if wxUSE_METAFILES
     #include "wx/metafile.h"
 #endif // wxUSE_METAFILES
 
 #if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__)

-    #include "mondrian.xpm"
-
+    #include "../sample.xpm"
+#if wxUSE_DRAG_AND_DROP

     #include "dnd_copy.xpm"
     #include "dnd_move.xpm"
     #include "dnd_none.xpm"
 #endif
     #include "dnd_copy.xpm"
     #include "dnd_move.xpm"
     #include "dnd_none.xpm"
 #endif

+#endif

 
 #if wxUSE_DRAG_AND_DROP
 
 
 #if wxUSE_DRAG_AND_DROP
 


@@ -81,7 +83,7 @@ class URLDropTarget : public wxDropTarget
 public:
     URLDropTarget() { SetDataObject(new wxURLDataObject); }
 
 public:
     URLDropTarget() { SetDataObject(new wxURLDataObject); }
 

-    void OnDropURL(wxCoord x, wxCoord y, const wxString& text)
+    void OnDropURL(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), const wxString& text)

     {
         // of course, a real program would do something more useful here...
         wxMessageBox(text, _T("wxDnD sample: got URL"),
     {
         // of course, a real program would do something more useful here...
         wxMessageBox(text, _T("wxDnD sample: got URL"),


@@ -90,7 +92,7 @@ public:
 
     // URLs can't be moved, only copied
     virtual wxDragResult OnDragOver(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y),
 
     // URLs can't be moved, only copied
     virtual wxDragResult OnDragOver(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y),

-                                    wxDragResult def)
+                                    wxDragResult WXUNUSED(def))

         {
             return wxDragLink;  // At least IE 5.x needs wxDragLink, the
                                 // other browsers on MSW seem okay with it too.
         {
             return wxDragLink;  // At least IE 5.x needs wxDragLink, the
                                 // other browsers on MSW seem okay with it too.


@@ -122,7 +124,7 @@ public:
 
 IMPLEMENT_APP(DnDApp);
 
 
 IMPLEMENT_APP(DnDApp);
 

-#if wxUSE_DRAG_AND_DROP
+#if wxUSE_DRAG_AND_DROP || wxUSE_CLIPBOARD

 
 // ----------------------------------------------------------------------------
 // Define canvas class to show a bitmap
 
 // ----------------------------------------------------------------------------
 // Define canvas class to show a bitmap


@@ -143,7 +145,7 @@ public:
         Refresh();
     }
 
         Refresh();
     }
 

-    void OnPaint(wxPaintEvent& event)
+    void OnPaint(wxPaintEvent& WXUNUSED(event))

     {
         wxPaintDC dc(this);
 
     {
         wxPaintDC dc(this);
 


@@ -218,7 +220,9 @@ public:
     void OnDragMoveAllow(wxCommandEvent& event);
     void OnNewFrame(wxCommandEvent& event);
     void OnHelp (wxCommandEvent& event);
     void OnDragMoveAllow(wxCommandEvent& event);
     void OnNewFrame(wxCommandEvent& event);
     void OnHelp (wxCommandEvent& event);

+#if wxUSE_LOG

     void OnLogClear(wxCommandEvent& event);
     void OnLogClear(wxCommandEvent& event);

+#endif // wxUSE_LOG

 
     void OnCopy(wxCommandEvent& event);
     void OnPaste(wxCommandEvent& event);
 
     void OnCopy(wxCommandEvent& event);
     void OnPaste(wxCommandEvent& event);


@@ -246,10 +250,13 @@ private:
     // GUI controls
     wxListBox  *m_ctrlFile,
                *m_ctrlText;
     // GUI controls
     wxListBox  *m_ctrlFile,
                *m_ctrlText;

+
+#if wxUSE_LOG

     wxTextCtrl *m_ctrlLog;
 
     wxLog *m_pLog,
           *m_pLogPrev;
     wxTextCtrl *m_ctrlLog;
 
     wxLog *m_pLog,
           *m_pLogPrev;

+#endif // wxUSE_LOG

 
     // move the text by default (or copy)?
     bool m_moveByDefault;
 
     // move the text by default (or copy)?
     bool m_moveByDefault;


@@ -267,6 +274,8 @@ private:
 // shapes, each one with its own colour and position
 // ----------------------------------------------------------------------------
 
 // shapes, each one with its own colour and position
 // ----------------------------------------------------------------------------
 

+#if wxUSE_DRAG_AND_DROP
+

 class DnDShape
 {
 public:
 class DnDShape
 {
 public:


@@ -336,10 +345,10 @@ protected:
 
     struct ShapeDump
     {
 
     struct ShapeDump
     {

-        int x, y,       // position
-            w, h,       // size
-            r, g, b,    // colour
-            k;          // kind
+        wxCoord x, y,             // position
+                w, h;             // size
+        int k;                    // kind
+        unsigned char r, g, b;    // colour

     };
 
     wxPoint  m_pos;
     };
 
     wxPoint  m_pos;


@@ -610,7 +619,7 @@ public:
     }
 
     virtual bool SetData(const wxDataFormat& format,
     }
 
     virtual bool SetData(const wxDataFormat& format,

-                         size_t len, const void *buf)
+                         size_t WXUNUSED(len), const void *buf)

     {
         wxCHECK_MSG( format == m_formatShape, false,
                      wxT( "unsupported format") );
     {
         wxCHECK_MSG( format == m_formatShape, false,
                      wxT( "unsupported format") );


@@ -738,9 +747,18 @@ public:
 
     // override base class (pure) virtuals
     virtual wxDragResult OnEnter(wxCoord x, wxCoord y, wxDragResult def)
 
     // override base class (pure) virtuals
     virtual wxDragResult OnEnter(wxCoord x, wxCoord y, wxDragResult def)

-        { m_frame->SetStatusText(_T("Mouse entered the frame")); return OnDragOver(x, y, def); }
+    {
+#if wxUSE_STATUSBAR
+        m_frame->SetStatusText(_T("Mouse entered the frame"));
+#endif // wxUSE_STATUSBAR
+        return OnDragOver(x, y, def);
+    }

     virtual void OnLeave()
     virtual void OnLeave()

-        { m_frame->SetStatusText(_T("Mouse left the frame")); }
+    {
+#if wxUSE_STATUSBAR
+        m_frame->SetStatusText(_T("Mouse left the frame"));
+#endif // wxUSE_STATUSBAR
+    }

     virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def)
     {
         if ( !GetData() )
     virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def)
     {
         if ( !GetData() )


@@ -760,6 +778,8 @@ private:
     DnDShapeFrame *m_frame;
 };
 
     DnDShapeFrame *m_frame;
 };
 

+#endif // wxUSE_DRAG_AND_DROP
+

 // ----------------------------------------------------------------------------
 // functions prototypes
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // functions prototypes
 // ----------------------------------------------------------------------------


@@ -806,7 +826,9 @@ BEGIN_EVENT_TABLE(DnDFrame, wxFrame)
     EVT_MENU(Menu_DragMoveAllow,DnDFrame::OnDragMoveAllow)
     EVT_MENU(Menu_NewFrame,   DnDFrame::OnNewFrame)
     EVT_MENU(Menu_Help,       DnDFrame::OnHelp)
     EVT_MENU(Menu_DragMoveAllow,DnDFrame::OnDragMoveAllow)
     EVT_MENU(Menu_NewFrame,   DnDFrame::OnNewFrame)
     EVT_MENU(Menu_Help,       DnDFrame::OnHelp)

+#if wxUSE_LOG

     EVT_MENU(Menu_Clear,      DnDFrame::OnLogClear)
     EVT_MENU(Menu_Clear,      DnDFrame::OnLogClear)

+#endif // wxUSE_LOG

     EVT_MENU(Menu_Copy,       DnDFrame::OnCopy)
     EVT_MENU(Menu_Paste,      DnDFrame::OnPaste)
     EVT_MENU(Menu_CopyBitmap, DnDFrame::OnCopyBitmap)
     EVT_MENU(Menu_Copy,       DnDFrame::OnCopy)
     EVT_MENU(Menu_Paste,      DnDFrame::OnPaste)
     EVT_MENU(Menu_CopyBitmap, DnDFrame::OnCopyBitmap)


@@ -827,6 +849,8 @@ BEGIN_EVENT_TABLE(DnDFrame, wxFrame)
     EVT_SIZE(                 DnDFrame::OnSize)
 END_EVENT_TABLE()
 
     EVT_SIZE(                 DnDFrame::OnSize)
 END_EVENT_TABLE()
 

+#if wxUSE_DRAG_AND_DROP
+

 BEGIN_EVENT_TABLE(DnDShapeFrame, wxFrame)
     EVT_MENU(Menu_Shape_New,    DnDShapeFrame::OnNewShape)
     EVT_MENU(Menu_Shape_Edit,   DnDShapeFrame::OnEditShape)
 BEGIN_EVENT_TABLE(DnDShapeFrame, wxFrame)
     EVT_MENU(Menu_Shape_New,    DnDShapeFrame::OnNewShape)
     EVT_MENU(Menu_Shape_Edit,   DnDShapeFrame::OnEditShape)


@@ -847,6 +871,8 @@ BEGIN_EVENT_TABLE(DnDShapeDialog, wxDialog)
     EVT_BUTTON(Button_Colour, DnDShapeDialog::OnColour)
 END_EVENT_TABLE()
 
     EVT_BUTTON(Button_Colour, DnDShapeDialog::OnColour)
 END_EVENT_TABLE()
 

+#endif // wxUSE_DRAG_AND_DROP
+

 BEGIN_EVENT_TABLE(DnDCanvasBitmap, wxScrolledWindow)
     EVT_PAINT(DnDCanvasBitmap::OnPaint)
 END_EVENT_TABLE()
 BEGIN_EVENT_TABLE(DnDCanvasBitmap, wxScrolledWindow)
     EVT_PAINT(DnDCanvasBitmap::OnPaint)
 END_EVENT_TABLE()


@@ -866,13 +892,15 @@ END_EVENT_TABLE()
 // `Main program' equivalent, creating windows and returning main app frame
 bool DnDApp::OnInit()
 {
 // `Main program' equivalent, creating windows and returning main app frame
 bool DnDApp::OnInit()
 {

-#if wxUSE_DRAG_AND_DROP
+#if wxUSE_DRAG_AND_DROP || wxUSE_CLIPBOARD

     // switch on trace messages
     // switch on trace messages

+#if wxUSE_LOG

 #if defined(__WXGTK__)
     wxLog::AddTraceMask(_T("clipboard"));
 #elif defined(__WXMSW__)
     wxLog::AddTraceMask(wxTRACE_OleCalls);
 #endif
 #if defined(__WXGTK__)
     wxLog::AddTraceMask(_T("clipboard"));
 #elif defined(__WXMSW__)
     wxLog::AddTraceMask(wxTRACE_OleCalls);
 #endif

+#endif // wxUSE_LOG

 
 #if wxUSE_LIBPNG
     wxImage::AddHandler( new wxPNGHandler );
 
 #if wxUSE_LIBPNG
     wxImage::AddHandler( new wxPNGHandler );


@@ -884,7 +912,7 @@ bool DnDApp::OnInit()
 
     // create the main frame window
     DnDFrame *frame = new DnDFrame((wxFrame  *) NULL,
 
     // create the main frame window
     DnDFrame *frame = new DnDFrame((wxFrame  *) NULL,

-                                   _T("Drag-and-Drop/Clipboard wxWindows Sample"),
+                                   _T("Drag-and-Drop/Clipboard wxWidgets Sample"),

                                    10, 100, 650, 340);
 
     // activate it
                                    10, 100, 650, 340);
 
     // activate it


@@ -899,17 +927,19 @@ bool DnDApp::OnInit()
 #endif // wxUSE_DRAG_AND_DROP
 }
 
 #endif // wxUSE_DRAG_AND_DROP
 }
 

-#if wxUSE_DRAG_AND_DROP
+#if wxUSE_DRAG_AND_DROP || wxUSE_CLIPBOARD

 
 DnDFrame::DnDFrame(wxFrame *frame, wxChar *title, int x, int y, int w, int h)
         : wxFrame(frame, wxID_ANY, title, wxPoint(x, y), wxSize(w, h)),
 
 DnDFrame::DnDFrame(wxFrame *frame, wxChar *title, int x, int y, int w, int h)
         : wxFrame(frame, wxID_ANY, title, wxPoint(x, y), wxSize(w, h)),

-          m_strText(_T("wxWindows drag & drop works :-)"))
+          m_strText(_T("wxWidgets drag & drop works :-)"))

 
 {
     // frame icon and status bar
 
 {
     // frame icon and status bar

-    SetIcon(wxICON(mondrian));
+    SetIcon(wxICON(sample));

 
 

+#if wxUSE_STATUSBAR

     CreateStatusBar();
     CreateStatusBar();

+#endif // wxUSE_STATUSBAR

 
     // construct menu
     wxMenu *file_menu = new wxMenu;
 
     // construct menu
     wxMenu *file_menu = new wxMenu;


@@ -921,8 +951,10 @@ DnDFrame::DnDFrame(wxFrame *frame, wxChar *title, int x, int y, int w, int h)
     file_menu->AppendSeparator();
     file_menu->Append(Menu_Quit, _T("E&xit\tCtrl-Q"));
 
     file_menu->AppendSeparator();
     file_menu->Append(Menu_Quit, _T("E&xit\tCtrl-Q"));
 

+#if wxUSE_LOG

     wxMenu *log_menu = new wxMenu;
     log_menu->Append(Menu_Clear, _T("Clear\tCtrl-L"));
     wxMenu *log_menu = new wxMenu;
     log_menu->Append(Menu_Clear, _T("Clear\tCtrl-L"));

+#endif // wxUSE_LOG

 
     wxMenu *help_menu = new wxMenu;
     help_menu->Append(Menu_Help, _T("&Help..."));
 
     wxMenu *help_menu = new wxMenu;
     help_menu->Append(Menu_Help, _T("&Help..."));


@@ -944,7 +976,9 @@ DnDFrame::DnDFrame(wxFrame *frame, wxChar *title, int x, int y, int w, int h)
 
     wxMenuBar *menu_bar = new wxMenuBar;
     menu_bar->Append(file_menu, _T("&File"));
 
     wxMenuBar *menu_bar = new wxMenuBar;
     menu_bar->Append(file_menu, _T("&File"));

+#if wxUSE_LOG

     menu_bar->Append(log_menu,  _T("&Log"));
     menu_bar->Append(log_menu,  _T("&Log"));

+#endif // wxUSE_LOG

     menu_bar->Append(clip_menu, _T("&Clipboard"));
     menu_bar->Append(help_menu, _T("&Help"));
 
     menu_bar->Append(clip_menu, _T("&Clipboard"));
     menu_bar->Append(help_menu, _T("&Help"));
 


@@ -958,6 +992,7 @@ DnDFrame::DnDFrame(wxFrame *frame, wxChar *title, int x, int y, int w, int h)
     m_ctrlText  = new wxListBox(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 1, &strText,
                                 wxLB_HSCROLL | wxLB_ALWAYS_SB );
 
     m_ctrlText  = new wxListBox(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 1, &strText,
                                 wxLB_HSCROLL | wxLB_ALWAYS_SB );
 

+#if wxUSE_LOG

     m_ctrlLog   = new wxTextCtrl(this, wxID_ANY, _T(""), wxDefaultPosition, wxDefaultSize,
                                  wxTE_MULTILINE | wxTE_READONLY |
                                  wxSUNKEN_BORDER );
     m_ctrlLog   = new wxTextCtrl(this, wxID_ANY, _T(""), wxDefaultPosition, wxDefaultSize,
                                  wxTE_MULTILINE | wxTE_READONLY |
                                  wxSUNKEN_BORDER );


@@ -965,22 +1000,31 @@ DnDFrame::DnDFrame(wxFrame *frame, wxChar *title, int x, int y, int w, int h)
     // redirect log messages to the text window
     m_pLog = new wxLogTextCtrl(m_ctrlLog);
     m_pLogPrev = wxLog::SetActiveTarget(m_pLog);
     // redirect log messages to the text window
     m_pLog = new wxLogTextCtrl(m_ctrlLog);
     m_pLogPrev = wxLog::SetActiveTarget(m_pLog);

+#endif // wxUSE_LOG

 
 

+#if wxUSE_DRAG_AND_DROP

     // associate drop targets with the controls
     m_ctrlFile->SetDropTarget(new DnDFile(m_ctrlFile));
     m_ctrlText->SetDropTarget(new DnDText(m_ctrlText));
     // associate drop targets with the controls
     m_ctrlFile->SetDropTarget(new DnDFile(m_ctrlFile));
     m_ctrlText->SetDropTarget(new DnDText(m_ctrlText));

+#if wxUSE_LOG

     m_ctrlLog->SetDropTarget(new URLDropTarget);
     m_ctrlLog->SetDropTarget(new URLDropTarget);

+#endif // wxUSE_LOG
+#endif // wxUSE_DRAG_AND_DROP

 
 

-    wxBoxSizer *m_sizer_top = new wxBoxSizer( wxHORIZONTAL );
-    m_sizer_top->Add(m_ctrlFile, 1, wxEXPAND );
-    m_sizer_top->Add(m_ctrlText, 1, wxEXPAND );
+    wxBoxSizer *sizer_top = new wxBoxSizer( wxHORIZONTAL );
+    sizer_top->Add(m_ctrlFile, 1, wxEXPAND );
+    sizer_top->Add(m_ctrlText, 1, wxEXPAND );

 
 

-    wxBoxSizer *m_sizer = new wxBoxSizer( wxVERTICAL );
-    m_sizer->Add(m_sizer_top, 1, wxEXPAND );
-    m_sizer->Add(m_ctrlLog, 1, wxEXPAND | wxBOTTOM, 50);
+    wxBoxSizer *sizer = new wxBoxSizer( wxVERTICAL );
+    sizer->Add(sizer_top, 1, wxEXPAND );
+#if wxUSE_LOG
+    sizer->Add(m_ctrlLog, 2, wxEXPAND);
+    sizer->SetItemMinSize(m_ctrlLog, 450, 0);
+#endif // wxUSE_LOG
+    sizer->AddSpacer(50);

 
 

-    SetSizer( m_sizer );
-    m_sizer->SetSizeHints( this );
+    SetSizer(sizer);
+    sizer->SetSizeHints( this );

 
     // copy data by default but allow moving it as well
     m_moveByDefault = false;
 
     // copy data by default but allow moving it as well
     m_moveByDefault = false;


@@ -1042,13 +1086,16 @@ void DnDFrame::OnUpdateUIPasteBitmap(wxUpdateUIEvent& event)
 
 void DnDFrame::OnNewFrame(wxCommandEvent& WXUNUSED(event))
 {
 
 void DnDFrame::OnNewFrame(wxCommandEvent& WXUNUSED(event))
 {

+#if wxUSE_DRAG_AND_DROP

     (new DnDShapeFrame(this))->Show(true);
 
     wxLogStatus(this, wxT("Double click the new frame to select a shape for it"));
     (new DnDShapeFrame(this))->Show(true);
 
     wxLogStatus(this, wxT("Double click the new frame to select a shape for it"));

+#endif // wxUSE_DRAG_AND_DROP

 }
 
 void DnDFrame::OnDrag(wxCommandEvent& WXUNUSED(event))
 {
 }
 
 void DnDFrame::OnDrag(wxCommandEvent& WXUNUSED(event))
 {

+#if wxUSE_DRAG_AND_DROP

     wxString strText = wxGetTextFromUser
         (
             _T("After you enter text in this dialog, press any mouse\n")
     wxString strText = wxGetTextFromUser
         (
             _T("After you enter text in this dialog, press any mouse\n")


@@ -1059,6 +1106,7 @@ void DnDFrame::OnDrag(wxCommandEvent& WXUNUSED(event))
         );
 
     m_strText = strText;
         );
 
     m_strText = strText;

+#endif // wxUSE_DRAG_AND_DROP

 }
 
 void DnDFrame::OnDragMoveByDefault(wxCommandEvent& event)
 }
 
 void DnDFrame::OnDragMoveByDefault(wxCommandEvent& event)


@@ -1084,7 +1132,7 @@ void DnDFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 void DnDFrame::OnHelp(wxCommandEvent& /* event */)
 {
     wxMessageDialog dialog(this,
 void DnDFrame::OnHelp(wxCommandEvent& /* event */)
 {
     wxMessageDialog dialog(this,

-                           _T("This small program demonstrates drag & drop support in wxWindows. The program window\n")
+                           _T("This small program demonstrates drag & drop support in wxWidgets. The program window\n")

                            _T("consists of 3 parts: the bottom pane is for debug messages, so that you can see what's\n")
                            _T("going on inside. The top part is split into 2 listboxes, the left one accepts files\n")
                            _T("and the right one accepts text.\n")
                            _T("consists of 3 parts: the bottom pane is for debug messages, so that you can see what's\n")
                            _T("going on inside. The top part is split into 2 listboxes, the left one accepts files\n")
                            _T("and the right one accepts text.\n")


@@ -1109,15 +1157,18 @@ void DnDFrame::OnHelp(wxCommandEvent& /* event */)
     dialog.ShowModal();
 }
 
     dialog.ShowModal();
 }
 

+#if wxUSE_LOG

 void DnDFrame::OnLogClear(wxCommandEvent& /* event */ )
 {
     m_ctrlLog->Clear();
     m_ctrlText->Clear();
     m_ctrlFile->Clear();
 }
 void DnDFrame::OnLogClear(wxCommandEvent& /* event */ )
 {
     m_ctrlLog->Clear();
     m_ctrlText->Clear();
     m_ctrlFile->Clear();
 }

+#endif // wxUSE_LOG

 
 void DnDFrame::OnLeftDown(wxMouseEvent &WXUNUSED(event) )
 {
 
 void DnDFrame::OnLeftDown(wxMouseEvent &WXUNUSED(event) )
 {

+#if wxUSE_DRAG_AND_DROP

     if ( !m_strText.IsEmpty() )
     {
         // start drag operation
     if ( !m_strText.IsEmpty() )
     {
         // start drag operation


@@ -1138,8 +1189,11 @@ void DnDFrame::OnLeftDown(wxMouseEvent &WXUNUSED(event) )
         else if ( m_moveAllow )
             flags |= wxDrag_AllowMove;
 
         else if ( m_moveAllow )
             flags |= wxDrag_AllowMove;
 

+        wxDragResult result = source.DoDragDrop(flags);
+
+#if wxUSE_STATUSBAR

         const wxChar *pc;
         const wxChar *pc;

-        switch ( source.DoDragDrop(flags) )
+        switch ( result )

         {
             case wxDragError:   pc = _T("Error!");    break;
             case wxDragNone:    pc = _T("Nothing");   break;
         {
             case wxDragError:   pc = _T("Error!");    break;
             case wxDragNone:    pc = _T("Nothing");   break;


@@ -1150,7 +1204,11 @@ void DnDFrame::OnLeftDown(wxMouseEvent &WXUNUSED(event) )
         }
 
         SetStatusText(wxString(_T("Drag result: ")) + pc);
         }
 
         SetStatusText(wxString(_T("Drag result: ")) + pc);

+#else
+        wxUnusedVar(result);
+#endif // wxUSE_STATUSBAR

     }
     }

+#endif // wxUSE_DRAG_AND_DROP

 }
 
 void DnDFrame::OnRightDown(wxMouseEvent &event )
 }
 
 void DnDFrame::OnRightDown(wxMouseEvent &event )


@@ -1166,10 +1224,12 @@ void DnDFrame::OnRightDown(wxMouseEvent &event )
 
 DnDFrame::~DnDFrame()
 {
 
 DnDFrame::~DnDFrame()
 {

+#if wxUSE_LOG

     if ( m_pLog != NULL ) {
         if ( wxLog::SetActiveTarget(m_pLogPrev) == m_pLog )
             delete m_pLog;
     }
     if ( m_pLog != NULL ) {
         if ( wxLog::SetActiveTarget(m_pLogPrev) == m_pLog )
             delete m_pLog;
     }

+#endif // wxUSE_LOG

 }
 
 // ---------------------------------------------------------------------------
 }
 
 // ---------------------------------------------------------------------------


@@ -1425,6 +1485,8 @@ void DnDFrame::OnPaste(wxCommandEvent& WXUNUSED(event))
     wxTheClipboard->Close();
 }
 
     wxTheClipboard->Close();
 }
 

+#if wxUSE_DRAG_AND_DROP
+

 // ----------------------------------------------------------------------------
 // Notifications called by the base class
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // Notifications called by the base class
 // ----------------------------------------------------------------------------


@@ -1584,7 +1646,7 @@ void DnDShapeDialog::OnColour(wxCommandEvent& WXUNUSED(event))
     data.SetChooseFull(true);
     for (int i = 0; i < 16; i++)
     {
     data.SetChooseFull(true);
     for (int i = 0; i < 16; i++)
     {

-        wxColour colour(i*16, i*16, i*16);
+        wxColour colour((unsigned char)(i*16), (unsigned char)(i*16), (unsigned char)(i*16));

         data.SetCustomColour(i, colour);
     }
 
         data.SetCustomColour(i, colour);
     }
 


@@ -1602,10 +1664,11 @@ void DnDShapeDialog::OnColour(wxCommandEvent& WXUNUSED(event))
 DnDShapeFrame *DnDShapeFrame::ms_lastDropTarget = NULL;
 
 DnDShapeFrame::DnDShapeFrame(wxFrame *parent)
 DnDShapeFrame *DnDShapeFrame::ms_lastDropTarget = NULL;
 
 DnDShapeFrame::DnDShapeFrame(wxFrame *parent)

-             : wxFrame(parent, wxID_ANY, _T("Shape Frame"),
-                       wxDefaultPosition, wxSize(250, 150))
+             : wxFrame(parent, wxID_ANY, _T("Shape Frame"))

 {
 {

+#if wxUSE_STATUSBAR

     CreateStatusBar();
     CreateStatusBar();

+#endif // wxUSE_STATUSBAR

 
     wxMenu *menuShape = new wxMenu;
     menuShape->Append(Menu_Shape_New, _T("&New default shape\tCtrl-S"));
 
     wxMenu *menuShape = new wxMenu;
     menuShape->Append(Menu_Shape_New, _T("&New default shape\tCtrl-S"));


@@ -1623,7 +1686,9 @@ DnDShapeFrame::DnDShapeFrame(wxFrame *parent)
 
     SetMenuBar(menubar);
 
 
     SetMenuBar(menubar);
 

+#if wxUSE_STATUSBAR

     SetStatusText(_T("Press Ctrl-S to create a new shape"));
     SetStatusText(_T("Press Ctrl-S to create a new shape"));

+#endif // wxUSE_STATUSBAR

 
     SetDropTarget(new DnDShapeDropTarget(this));
 
 
     SetDropTarget(new DnDShapeDropTarget(this));
 


@@ -1669,7 +1734,9 @@ void DnDShapeFrame::OnDrag(wxMouseEvent& event)
             break;
 
         case wxDragNone:
             break;
 
         case wxDragNone:

+#if wxUSE_STATUSBAR

             SetStatusText(_T("Nothing happened"));
             SetStatusText(_T("Nothing happened"));

+#endif // wxUSE_STATUSBAR

             break;
 
         case wxDragCopy:
             break;
 
         case wxDragCopy:


@@ -1686,13 +1753,17 @@ void DnDShapeFrame::OnDrag(wxMouseEvent& event)
             break;
 
         case wxDragCancel:
             break;
 
         case wxDragCancel:

+#if wxUSE_STATUSBAR

             SetStatusText(_T("Drag and drop operation cancelled"));
             SetStatusText(_T("Drag and drop operation cancelled"));

+#endif // wxUSE_STATUSBAR

             break;
     }
 
     if ( pc )
     {
             break;
     }
 
     if ( pc )
     {

+#if wxUSE_STATUSBAR

         SetStatusText(wxString(_T("Shape successfully ")) + pc);
         SetStatusText(wxString(_T("Shape successfully ")) + pc);

+#endif // wxUSE_STATUSBAR

     }
     //else: status text already set
 }
     }
     //else: status text already set
 }


@@ -1703,9 +1774,11 @@ void DnDShapeFrame::OnDrop(wxCoord x, wxCoord y, DnDShape *shape)
 
     wxPoint pt(x, y);
 
 
     wxPoint pt(x, y);
 

+#if wxUSE_STATUSBAR

     wxString s;
     s.Printf(wxT("Shape dropped at (%d, %d)"), pt.x, pt.y);
     SetStatusText(s);
     wxString s;
     s.Printf(wxT("Shape dropped at (%d, %d)"), pt.x, pt.y);
     SetStatusText(s);

+#endif // wxUSE_STATUSBAR

 
     shape->Move(pt);
     SetShape(shape);
 
     shape->Move(pt);
     SetShape(shape);


@@ -1718,10 +1791,12 @@ void DnDShapeFrame::OnEditShape(wxCommandEvent& WXUNUSED(event))
     {
         SetShape(dlg.GetShape());
 
     {
         SetShape(dlg.GetShape());
 

+#if wxUSE_STATUSBAR

         if ( m_shape )
         {
             SetStatusText(_T("You can now drag the shape to another frame"));
         }
         if ( m_shape )
         {
             SetStatusText(_T("You can now drag the shape to another frame"));
         }

+#endif // wxUSE_STATUSBAR

     }
 }
 
     }
 }
 


@@ -1729,7 +1804,9 @@ void DnDShapeFrame::OnNewShape(wxCommandEvent& WXUNUSED(event))
 {
     SetShape(new DnDEllipticShape(wxPoint(10, 10), wxSize(80, 60), *wxRED));
 
 {
     SetShape(new DnDEllipticShape(wxPoint(10, 10), wxSize(80, 60), *wxRED));
 

+#if wxUSE_STATUSBAR

     SetStatusText(_T("You can now drag the shape to another frame"));
     SetStatusText(_T("You can now drag the shape to another frame"));

+#endif // wxUSE_STATUSBAR

 }
 
 void DnDShapeFrame::OnClearShape(wxCommandEvent& WXUNUSED(event))
 }
 
 void DnDShapeFrame::OnClearShape(wxCommandEvent& WXUNUSED(event))


@@ -1873,6 +1950,8 @@ void DnDShapeDataObject::CreateBitmap() const
     self->m_hasBitmap = true;
 }
 
     self->m_hasBitmap = true;
 }
 

+#endif // wxUSE_DRAG_AND_DROP
+

 // ----------------------------------------------------------------------------
 // global functions
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // global functions
 // ----------------------------------------------------------------------------


@@ -1880,13 +1959,17 @@ void DnDShapeDataObject::CreateBitmap() const
 static void ShowBitmap(const wxBitmap& bitmap)
 {
     wxFrame *frame = new wxFrame(NULL, wxID_ANY, _T("Bitmap view"));
 static void ShowBitmap(const wxBitmap& bitmap)
 {
     wxFrame *frame = new wxFrame(NULL, wxID_ANY, _T("Bitmap view"));

+#if wxUSE_STATUSBAR

     frame->CreateStatusBar();
     frame->CreateStatusBar();

+#endif // wxUSE_STATUSBAR

     DnDCanvasBitmap *canvas = new DnDCanvasBitmap(frame);
     canvas->SetBitmap(bitmap);
 
     int w = bitmap.GetWidth(),
         h = bitmap.GetHeight();
     DnDCanvasBitmap *canvas = new DnDCanvasBitmap(frame);
     canvas->SetBitmap(bitmap);
 
     int w = bitmap.GetWidth(),
         h = bitmap.GetHeight();

+#if wxUSE_STATUSBAR

     frame->SetStatusText(wxString::Format(_T("%dx%d"), w, h));
     frame->SetStatusText(wxString::Format(_T("%dx%d"), w, h));

+#endif // wxUSE_STATUSBAR

 
     frame->SetClientSize(w > 100 ? 100 : w, h > 100 ? 100 : h);
     frame->Show(true);
 
     frame->SetClientSize(w > 100 ? 100 : w, h > 100 ? 100 : h);
     frame->Show(true);


@@ -1911,4 +1994,4 @@ static void ShowMetaFile(const wxMetaFile& metafile)
 
 #endif // wxUSE_METAFILES
 
 
 #endif // wxUSE_METAFILES
 

-#endif // wxUSE_DRAG_AND_DROP
+#endif // wxUSE_DRAG_AND_DROP || wxUSE_CLIPBOARD