Added more makefiles; fixed some samples for Cygwin

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

diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp
index 1aef2bffabc1180bbf4ec33b2a07eacb3c706e3b..da243509affa4d01a9866fed8de629686e39f4d3 100644 (file)
--- a/samples/controls/controls.cpp
+++ b/samples/controls/controls.cpp
@@ -27,8 +27,15 @@
 #include "wx/notebook.h"
 #include "wx/imaglist.h"
 #include "wx/spinbutt.h"
 #include "wx/notebook.h"
 #include "wx/imaglist.h"
 #include "wx/spinbutt.h"

-#include "wx/clipbrd.h"
-#include "wx/tooltip.h"
+
+#if wxUSE_CLIPBOARD
+    #include "wx/dataobj.h"
+    #include "wx/clipbrd.h"
+#endif
+
+#if wxUSE_TOOLTIPS
+    #include "wx/tooltip.h"
+#endif

 
 #if defined(__WXGTK__) || defined(__WXMOTIF__)
     #define USE_XPM
 
 #if defined(__WXGTK__) || defined(__WXMOTIF__)
     #define USE_XPM


@@ -50,8 +57,8 @@
 
 class MyApp: public wxApp
 {
 
 class MyApp: public wxApp
 {

-  public:
-    bool OnInit(void);
+public:
+    bool OnInit();

 };
 
 // a text ctrl which allows to call different wxTextCtrl functions
 };
 
 // a text ctrl which allows to call different wxTextCtrl functions


@@ -63,7 +70,7 @@ public:
                const wxPoint &pos, const wxSize &size, int style = 0)
         : wxTextCtrl(parent, id, value, pos, size, style) { }
 
                const wxPoint &pos, const wxSize &size, int style = 0)
         : wxTextCtrl(parent, id, value, pos, size, style) { }
 

-    void OnChar(wxKeyEvent& event);
+    void OnKeyDown(wxKeyEvent& event);

 
 private:
     DECLARE_EVENT_TABLE()
 
 private:
     DECLARE_EVENT_TABLE()


@@ -71,11 +78,10 @@ private:
 
 class MyPanel: public wxPanel
 {
 
 class MyPanel: public wxPanel
 {

-  public:
-
+public:

     MyPanel(wxFrame *frame, int x, int y, int w, int h);
     virtual ~MyPanel();
     MyPanel(wxFrame *frame, int x, int y, int w, int h);
     virtual ~MyPanel();

-
+    

     void OnSize( wxSizeEvent& event );
     void OnListBox( wxCommandEvent &event );
     void OnListBoxDoubleClick( wxCommandEvent &event );
     void OnSize( wxSizeEvent& event );
     void OnListBox( wxCommandEvent &event );
     void OnListBoxDoubleClick( wxCommandEvent &event );


@@ -94,7 +100,7 @@ class MyPanel: public wxPanel
     void OnCopyToClipboard( wxCommandEvent &event );
     void OnMoveToEndOfText( wxCommandEvent &event );
     void OnMoveToEndOfEntry( wxCommandEvent &event );
     void OnCopyToClipboard( wxCommandEvent &event );
     void OnMoveToEndOfText( wxCommandEvent &event );
     void OnMoveToEndOfEntry( wxCommandEvent &event );

-
+    

     wxListBox     *m_listbox;
     wxChoice      *m_choice;
     wxComboBox    *m_combo;
     wxListBox     *m_listbox;
     wxChoice      *m_choice;
     wxComboBox    *m_combo;


@@ -107,26 +113,26 @@ class MyPanel: public wxPanel
     MyTextCtrl    *m_multitext;
     MyTextCtrl    *m_textentry;
     wxCheckBox    *m_checkbox;
     MyTextCtrl    *m_multitext;
     MyTextCtrl    *m_textentry;
     wxCheckBox    *m_checkbox;

-
+    

     wxTextCtrl    *m_text;
     wxNotebook    *m_notebook;
 
     wxTextCtrl    *m_text;
     wxNotebook    *m_notebook;
 

-  DECLARE_EVENT_TABLE()
+private:
+    DECLARE_EVENT_TABLE()

 };
 
 class MyFrame: public wxFrame
 {
 };
 
 class MyFrame: public wxFrame
 {

-  public:
-
+public:

     MyFrame(wxFrame *frame, char *title, int x, int y, int w, int h);
 
     MyFrame(wxFrame *frame, char *title, int x, int y, int w, int h);
 

-  public:
-

     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);
     void OnIdle( wxIdleEvent& event );
     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);
     void OnIdle( wxIdleEvent& event );

+    void OnSize( wxSizeEvent& event );

 
 

-  DECLARE_EVENT_TABLE()
+private:
+    DECLARE_EVENT_TABLE()

 };
 
 //----------------------------------------------------------------------
 };
 
 //----------------------------------------------------------------------


@@ -143,7 +149,7 @@ const   int MINIMAL_QUIT   = 100;
 const   int MINIMAL_TEXT   = 101;
 const   int MINIMAL_ABOUT  = 102;
 
 const   int MINIMAL_TEXT   = 101;
 const   int MINIMAL_ABOUT  = 102;
 

-bool MyApp::OnInit(void)
+bool MyApp::OnInit()

 {
   // Create the main frame window
   MyFrame *frame = new MyFrame((wxFrame *) NULL,
 {
   // Create the main frame window
   MyFrame *frame = new MyFrame((wxFrame *) NULL,


@@ -176,10 +182,10 @@ bool MyApp::OnInit(void)
 //----------------------------------------------------------------------
 
 BEGIN_EVENT_TABLE(MyTextCtrl, wxTextCtrl)
 //----------------------------------------------------------------------
 
 BEGIN_EVENT_TABLE(MyTextCtrl, wxTextCtrl)

-    EVT_CHAR(MyTextCtrl::OnChar)
+    EVT_KEY_DOWN(MyTextCtrl::OnKeyDown)

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

-void MyTextCtrl::OnChar(wxKeyEvent& event)
+void MyTextCtrl::OnKeyDown(wxKeyEvent& event)

 {
     switch ( event.KeyCode() )
     {
 {
     switch ( event.KeyCode() )
     {


@@ -314,8 +320,9 @@ BEGIN_EVENT_TABLE(MyPanel, wxPanel)
   EVT_BUTTON    (ID_MOVE_END_ENTRY,       MyPanel::OnMoveToEndOfEntry)
 END_EVENT_TABLE()
 
   EVT_BUTTON    (ID_MOVE_END_ENTRY,       MyPanel::OnMoveToEndOfEntry)
 END_EVENT_TABLE()
 

-MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) :
-  wxPanel( frame, -1, wxPoint(x, y), wxSize(w, h) )
+MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
+       : wxPanel( frame, -1, wxPoint(x, y), wxSize(w, h) ),
+         m_text(NULL), m_notebook(NULL)

 {
 //  SetBackgroundColour("cadet blue");
 
 {
 //  SetBackgroundColour("cadet blue");
 


@@ -356,7 +363,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) :
   {
     Image_List, Image_Choice, Image_Combo, Image_Text, Image_Radio, Image_Gauge, Image_Max
   };
   {
     Image_List, Image_Choice, Image_Combo, Image_Text, Image_Radio, Image_Gauge, Image_Max
   };

-  wxImageList *imagelist = new wxImageList(32, 32, FALSE, Image_Max);
+  wxImageList *imagelist = new wxImageList(16, 16, FALSE, Image_Max);

 
   static const char *s_iconNames[Image_Max] =
   {
 
   static const char *s_iconNames[Image_Max] =
   {


@@ -387,38 +394,34 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) :
 
 #endif
 
 
 #endif
 

-  wxButton *button = (wxButton*)NULL;
-
-//  m_notebook->SetBackgroundColour("cadet blue");
-
+  wxButton *button = (wxButton*) NULL;  /* who did this ? */

   wxPanel *panel = (wxPanel*) NULL;
 
   panel = new wxPanel(m_notebook);
   wxPanel *panel = (wxPanel*) NULL;
 
   panel = new wxPanel(m_notebook);

-//  panel->SetBackgroundColour("cadet blue");
-//  panel->SetForegroundColour("blue");

   m_listbox = new wxListBox( panel, ID_LISTBOX, wxPoint(10,10), wxSize(120,70), 5, choices );
   m_listbox = new wxListBox( panel, ID_LISTBOX, wxPoint(10,10), wxSize(120,70), 5, choices );

+#if wxUSE_TOOLTIPS

   m_listbox->SetToolTip( "This is a list box" );
   m_listbox->SetToolTip( "This is a list box" );

+#endif

 
 

-//  m_listbox->SetBackgroundColour("wheat");

   (void)new wxButton( panel, ID_LISTBOX_SEL_NUM, "Select #2", wxPoint(180,30), wxSize(140,30) );
   (void)new wxButton( panel, ID_LISTBOX_SEL_STR, "Select 'This'", wxPoint(340,30), wxSize(140,30) );
   (void)new wxButton( panel, ID_LISTBOX_CLEAR, "Clear", wxPoint(180,80), wxSize(140,30) );
   (void)new wxButton( panel, ID_LISTBOX_APPEND, "Append 'Hi!'", wxPoint(340,80), wxSize(140,30) );
   (void)new wxButton( panel, ID_LISTBOX_DELETE, "Delete selected item", wxPoint(180,130), wxSize(140,30) );
   button = new wxButton( panel, ID_LISTBOX_FONT, "Set Italic font", wxPoint(340,130), wxSize(140,30) );
   (void)new wxButton( panel, ID_LISTBOX_SEL_NUM, "Select #2", wxPoint(180,30), wxSize(140,30) );
   (void)new wxButton( panel, ID_LISTBOX_SEL_STR, "Select 'This'", wxPoint(340,30), wxSize(140,30) );
   (void)new wxButton( panel, ID_LISTBOX_CLEAR, "Clear", wxPoint(180,80), wxSize(140,30) );
   (void)new wxButton( panel, ID_LISTBOX_APPEND, "Append 'Hi!'", wxPoint(340,80), wxSize(140,30) );
   (void)new wxButton( panel, ID_LISTBOX_DELETE, "Delete selected item", wxPoint(180,130), wxSize(140,30) );
   button = new wxButton( panel, ID_LISTBOX_FONT, "Set Italic font", wxPoint(340,130), wxSize(140,30) );

+#if wxUSE_TOOLTIPS

   button->SetToolTip( "Press here to set italic font" );
   button->SetToolTip( "Press here to set italic font" );

+#endif

 
 

-//  button->SetForegroundColour( "red" );

   m_checkbox = new wxCheckBox( panel, ID_LISTBOX_ENABLE, "Disable", wxPoint(20,130), wxSize(140,30) );
   m_checkbox->SetValue(FALSE);
   m_checkbox = new wxCheckBox( panel, ID_LISTBOX_ENABLE, "Disable", wxPoint(20,130), wxSize(140,30) );
   m_checkbox->SetValue(FALSE);

+#if wxUSE_TOOLTIPS

   m_checkbox->SetToolTip( "Click here to disable the listbox" );
   m_checkbox->SetToolTip( "Click here to disable the listbox" );

-  m_notebook->AddPage(panel, "wxList", TRUE, Image_List);
+#endif
+  m_notebook->AddPage(panel, "wxListBox", TRUE, Image_List);

 
   panel = new wxPanel(m_notebook);
 
   panel = new wxPanel(m_notebook);

-//  panel->SetBackgroundColour("cadet blue");
-//  panel->SetForegroundColour("blue");

   m_choice = new wxChoice( panel, ID_CHOICE, wxPoint(10,10), wxSize(120,-1), 5, choices );
   m_choice = new wxChoice( panel, ID_CHOICE, wxPoint(10,10), wxSize(120,-1), 5, choices );

-//  m_choice->SetBackgroundColour("wheat");

   (void)new wxButton( panel, ID_CHOICE_SEL_NUM, "Select #2", wxPoint(180,30), wxSize(140,30) );
   (void)new wxButton( panel, ID_CHOICE_SEL_STR, "Select 'This'", wxPoint(340,30), wxSize(140,30) );
   (void)new wxButton( panel, ID_CHOICE_CLEAR, "Clear", wxPoint(180,80), wxSize(140,30) );
   (void)new wxButton( panel, ID_CHOICE_SEL_NUM, "Select #2", wxPoint(180,30), wxSize(140,30) );
   (void)new wxButton( panel, ID_CHOICE_SEL_STR, "Select 'This'", wxPoint(340,30), wxSize(140,30) );
   (void)new wxButton( panel, ID_CHOICE_CLEAR, "Clear", wxPoint(180,80), wxSize(140,30) );


@@ -429,10 +432,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) :
   m_notebook->AddPage(panel, "wxChoice", FALSE, Image_Choice);
 
   panel = new wxPanel(m_notebook);
   m_notebook->AddPage(panel, "wxChoice", FALSE, Image_Choice);
 
   panel = new wxPanel(m_notebook);

-//  panel->SetBackgroundColour("cadet blue");
-//  panel->SetForegroundColour("blue");

   m_combo = new wxComboBox( panel, ID_COMBO, "This", wxPoint(10,10), wxSize(120,-1), 5, choices );
   m_combo = new wxComboBox( panel, ID_COMBO, "This", wxPoint(10,10), wxSize(120,-1), 5, choices );

-//  m_combo->SetBackgroundColour("wheat");

   (void)new wxButton( panel, ID_COMBO_SEL_NUM, "Select #2", wxPoint(180,30), wxSize(140,30) );
   (void)new wxButton( panel, ID_COMBO_SEL_STR, "Select 'This'", wxPoint(340,30), wxSize(140,30) );
   (void)new wxButton( panel, ID_COMBO_CLEAR, "Clear", wxPoint(180,80), wxSize(140,30) );
   (void)new wxButton( panel, ID_COMBO_SEL_NUM, "Select #2", wxPoint(180,30), wxSize(140,30) );
   (void)new wxButton( panel, ID_COMBO_SEL_STR, "Select 'This'", wxPoint(340,30), wxSize(140,30) );
   (void)new wxButton( panel, ID_COMBO_CLEAR, "Clear", wxPoint(180,80), wxSize(140,30) );


@@ -443,32 +443,31 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) :
   m_notebook->AddPage(panel, "wxComboBox", FALSE, Image_Combo);
 
   panel = new wxPanel(m_notebook);
   m_notebook->AddPage(panel, "wxComboBox", FALSE, Image_Combo);
 
   panel = new wxPanel(m_notebook);

-//  panel->SetBackgroundColour("cadet blue");
-//  panel->SetForegroundColour("blue");
-  m_textentry = new MyTextCtrl( panel, -1, "Write text here.",
-                                wxPoint(10,10), wxSize(320,28),
+  m_textentry = new MyTextCtrl( panel, -1, "Some text.", wxPoint(10,10), wxSize(320,28),
+                                //0);

                                 wxTE_PROCESS_ENTER);
                                 wxTE_PROCESS_ENTER);

-  (*m_textentry) << " More text.";
-//  m_textentry->SetBackgroundColour("wheat");
-  m_multitext = new MyTextCtrl( panel, ID_TEXT, "And here.",
-                                wxPoint(10,50), wxSize(320,80),
+  (*m_textentry) << " Appended.";
+  m_textentry->SetInsertionPoint(0);
+  m_textentry->WriteText( "Prepended. " );
+
+  m_multitext = new MyTextCtrl( panel, ID_TEXT, "Some text.", wxPoint(10,50), wxSize(320,70),

                                 wxTE_MULTILINE );
                                 wxTE_MULTILINE );

-  (*m_multitext) << " More text."
-                 << "\nPress Fn keys to test different wxTextCtrl functions";
-//  m_multitext->SetBackgroundColour("wheat");
-  (void)new MyTextCtrl( panel, -1, "This one is with wxTE_PROCESS_TAB style.",
-                        wxPoint(10,140), wxSize(320,80), wxTE_MULTILINE | wxTE_PROCESS_TAB);
-
-  (void)new wxStaticBox( panel, -1, "&Move cursor to the end of:",
-                         wxPoint(345, 0), wxSize(160, 100) );
-  (void)new wxButton(panel, ID_MOVE_END_ENTRY, "Text &entry",
-                     wxPoint(370, 20), wxSize(110, 30));
-  (void)new wxButton(panel, ID_MOVE_END_ZONE, "Text &zone",
-                     wxPoint(370, 60), wxSize(110, 30));
-  (void)new wxStaticBox( panel, -1, "wx&Clipboard", wxPoint(345,120), wxSize(160,100) );
-  (void)new wxButton( panel, ID_COPY_TEXT, "C&opy line 1", wxPoint(370,140), wxSize(110,30) );
-  (void)new wxButton( panel, ID_PASTE_TEXT, "&Paste text", wxPoint(370,180), wxSize(110,30) );
-  m_notebook->AddPage(panel, "wxTextCtrl" , FALSE, Image_Text);
+  (*m_multitext) << " Appended.";
+  m_multitext->SetInsertionPoint(0);
+  m_multitext->WriteText( "Prepended. " );
+  m_multitext->AppendText( "\nPress function keys to test different \nwxTextCtrl functions." );
+  
+  new MyTextCtrl( panel, -1, "This one is with wxTE_PROCESS_TAB style.",
+                             wxPoint(10,120), wxSize(320,70), wxTE_MULTILINE | wxTE_PROCESS_TAB);
+
+  (void)new wxStaticBox( panel, -1, "&Move cursor to the end of:", wxPoint(345, 0), wxSize(160, 100) );
+  (void)new wxButton( panel, ID_MOVE_END_ENTRY, "Text &entry", wxPoint(370, 20), wxSize(110, 30) );
+  (void)new wxButton( panel, ID_MOVE_END_ZONE, "Text &zone", wxPoint(370, 60), wxSize(110, 30) );
+  (void)new wxStaticBox( panel, -1, "wx&Clipboard", wxPoint(345,110), wxSize(160,100) );
+  (void)new wxButton( panel, ID_COPY_TEXT, "C&opy line 1", wxPoint(375,130), wxSize(110,30) );
+  (new wxButton( panel, ID_PASTE_TEXT, "&Paste text", wxPoint(375,170), wxSize(110,30) ))
+      ->SetDefault();
+  m_notebook->AddPage( panel, "wxTextCtrl" , FALSE, Image_Text );

 
   wxString choices2[] =
   {
 
   wxString choices2[] =
   {


@@ -477,15 +476,11 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) :
   };
 
   panel = new wxPanel(m_notebook);
   };
 
   panel = new wxPanel(m_notebook);

-//  panel->SetBackgroundColour("cadet blue");
-//  panel->SetForegroundColour("blue");

   (void)new wxRadioBox( panel, ID_RADIOBOX, "That", wxPoint(10,160), wxSize(-1,-1), 2, choices2, 1, wxRA_SPECIFY_ROWS );
   (void)new wxRadioBox( panel, ID_RADIOBOX, "That", wxPoint(10,160), wxSize(-1,-1), 2, choices2, 1, wxRA_SPECIFY_ROWS );

-  m_radio = new wxRadioBox( panel, ID_RADIOBOX, "This", wxPoint(10,10), wxSize(-1,-1), 5, choices, 2, wxRA_SPECIFY_COLS );
-//  m_radio->SetBackgroundColour("wheat");
+  m_radio = new wxRadioBox( panel, ID_RADIOBOX, "This", wxPoint(10,10), wxSize(-1,-1), 5, choices, 1, wxRA_SPECIFY_COLS );

   (void)new wxButton( panel, ID_RADIOBOX_SEL_NUM, "Select #2", wxPoint(180,30), wxSize(140,30) );
   (void)new wxButton( panel, ID_RADIOBOX_SEL_STR, "Select 'This'", wxPoint(180,80), wxSize(140,30) );
   m_fontButton = new wxButton( panel, ID_SET_FONT, "Set more Italic font", wxPoint(340,30), wxSize(140,30) );
   (void)new wxButton( panel, ID_RADIOBOX_SEL_NUM, "Select #2", wxPoint(180,30), wxSize(140,30) );
   (void)new wxButton( panel, ID_RADIOBOX_SEL_STR, "Select 'This'", wxPoint(180,80), wxSize(140,30) );
   m_fontButton = new wxButton( panel, ID_SET_FONT, "Set more Italic font", wxPoint(340,30), wxSize(140,30) );

-//  m_fontButton->SetForegroundColour("blue");

   (void)new wxButton( panel, ID_RADIOBOX_FONT, "Set Italic font", wxPoint(340,80), wxSize(140,30) );
   (void)new wxCheckBox( panel, ID_RADIOBOX_ENABLE, "Disable", wxPoint(340,130), wxSize(140,30) );
   wxRadioButton *rb = new wxRadioButton( panel, ID_RADIOBUTTON_1, "Radiobutton1", wxPoint(210,170), wxSize(110,30) );
   (void)new wxButton( panel, ID_RADIOBOX_FONT, "Set Italic font", wxPoint(340,80), wxSize(140,30) );
   (void)new wxCheckBox( panel, ID_RADIOBOX_ENABLE, "Disable", wxPoint(340,130), wxSize(140,30) );
   wxRadioButton *rb = new wxRadioButton( panel, ID_RADIOBUTTON_1, "Radiobutton1", wxPoint(210,170), wxSize(110,30) );


@@ -494,13 +489,9 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) :
   m_notebook->AddPage(panel, "wxRadioBox", FALSE, Image_Radio);
 
   panel = new wxPanel(m_notebook);
   m_notebook->AddPage(panel, "wxRadioBox", FALSE, Image_Radio);
 
   panel = new wxPanel(m_notebook);

-//  panel->SetBackgroundColour("cadet blue");
-//  panel->SetForegroundColour("blue");

   (void)new wxStaticBox( panel, -1, "wxGauge and wxSlider", wxPoint(10,10), wxSize(180,130) );
   m_gauge = new wxGauge( panel, -1, 200, wxPoint(18,50), wxSize(155, 30) );
   (void)new wxStaticBox( panel, -1, "wxGauge and wxSlider", wxPoint(10,10), wxSize(180,130) );
   m_gauge = new wxGauge( panel, -1, 200, wxPoint(18,50), wxSize(155, 30) );

-//  m_gauge->SetBackgroundColour("wheat");

   m_slider = new wxSlider( panel, ID_SLIDER, 0, 0, 200, wxPoint(18,90), wxSize(155,-1) );
   m_slider = new wxSlider( panel, ID_SLIDER, 0, 0, 200, wxPoint(18,90), wxSize(155,-1) );

-//  m_slider->SetBackgroundColour("wheat");

   (void)new wxStaticBox( panel, -1, "Explanation", wxPoint(200,10), wxSize(290,130) );
 #ifdef __WXMOTIF__
   // No wrapping text in wxStaticText yet :-(
   (void)new wxStaticBox( panel, -1, "Explanation", wxPoint(200,10), wxSize(290,130) );
 #ifdef __WXMOTIF__
   // No wrapping text in wxStaticText yet :-(


@@ -518,95 +509,101 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) :
     "This is also supposed to demonstrate how\n"
     "to use static controls.\n",
     wxPoint(208,25),
     "This is also supposed to demonstrate how\n"
     "to use static controls.\n",
     wxPoint(208,25),

-    wxSize(210, 110)
+    wxSize(250, 110)

     );
 #endif
   m_spintext = new wxTextCtrl( panel, -1, "0", wxPoint(20,160), wxSize(80,-1) );
     );
 #endif
   m_spintext = new wxTextCtrl( panel, -1, "0", wxPoint(20,160), wxSize(80,-1) );

-//  m_spintext->SetBackgroundColour("wheat");

   m_spinbutton = new wxSpinButton( panel, ID_SPIN, wxPoint(103,159), wxSize(-1,-1) );
   m_spinbutton = new wxSpinButton( panel, ID_SPIN, wxPoint(103,159), wxSize(-1,-1) );

-//  m_spinbutton->SetBackgroundColour("wheat");

   m_spinbutton->SetRange(0,100);
   m_spinbutton->SetRange(0,100);

-

   m_notebook->AddPage(panel, "wxGauge", FALSE, Image_Gauge);
 }
 
 void MyPanel::OnPasteFromClipboard( wxCommandEvent &WXUNUSED(event) )
 {
   m_notebook->AddPage(panel, "wxGauge", FALSE, Image_Gauge);
 }
 
 void MyPanel::OnPasteFromClipboard( wxCommandEvent &WXUNUSED(event) )
 {

-#ifdef __WXGTK__
+  // We test for wxUSE_DRAG_AND_DROP also, because data objects
+  // may not be implemented for compilers that can't cope with the OLE
+  // parts in wxUSE_DRAG_AND_DROP.

 
 

+#if wxUSE_CLIPBOARD && wxUSE_DRAG_AND_DROP

   if (!wxTheClipboard->Open())
   {
   if (!wxTheClipboard->Open())
   {

-     *m_text << "Error opening the clipboard." << "\n";
+     *m_text << "Error opening the clipboard.\n";

 
      return;
   }
   else
   {
 
      return;
   }
   else
   {

-     *m_text << "Successfully opened the clipboard." << "\n";
+     *m_text << "Successfully opened the clipboard.\n";

   }
 
   wxTextDataObject data;
 
   }
 
   wxTextDataObject data;
 

-  if (wxTheClipboard->IsSupported( data ))
+  if (wxTheClipboard->IsSupported( data.GetFormat() ))

   {
   {

-     *m_text << "Clipboard supports requested format." << "\n";
+     *m_text << "Clipboard supports requested format.\n";

      
      

-     if (wxTheClipboard->GetData( data ))
+     if (wxTheClipboard->GetData( &data ))

      {
      {

-         *m_text << "Successfully retrieved data from the clipboard." << "\n";
+         *m_text << "Successfully retrieved data from the clipboard.\n";

          *m_multitext << data.GetText() << "\n";
      }
      else
      {
          *m_multitext << data.GetText() << "\n";
      }
      else
      {

-        *m_text << "Error getting data from the clipboard." << "\n";
+        *m_text << "Error getting data from the clipboard.\n";

      }
   }
   else
   {
      }
   }
   else
   {

-     *m_text << "Clipboard doesn't support requested format." << "\n";
+     *m_text << "Clipboard doesn't support requested format.\n";

   }
 
   wxTheClipboard->Close();
 
   }
 
   wxTheClipboard->Close();
 

-  *m_text << "Closed the clipboard." << "\n";
-
+  *m_text << "Closed the clipboard.\n";
+#else
+  wxLogError("Your version of wxWindows is compiled without clipboard support.");

 #endif
 }
 
 void MyPanel::OnCopyToClipboard( wxCommandEvent &WXUNUSED(event) )
 {
 #endif
 }
 
 void MyPanel::OnCopyToClipboard( wxCommandEvent &WXUNUSED(event) )
 {

-#ifdef __WXGTK__
-
+#if wxUSE_CLIPBOARD && wxUSE_DRAG_AND_DROP

   wxString text( m_multitext->GetLineText(0) );
 
   wxString text( m_multitext->GetLineText(0) );
 

-  if (text.IsEmpty()) return;
+  if (text.IsEmpty())
+  {
+      *m_text << "No text to copy.\n";
+
+      return;
+  }

 
   if (!wxTheClipboard->Open())
   {
 
   if (!wxTheClipboard->Open())
   {

-     *m_text << "Error opening the clipboard." << "\n";
+     *m_text << "Error opening the clipboard.\n";

 
      return;
   }
   else
   {
 
      return;
   }
   else
   {

-     *m_text << "Successfully opened the clipboard." << "\n";
+     *m_text << "Successfully opened the clipboard.\n";

   }
 
   wxTextDataObject *data = new wxTextDataObject( text );
 
   if (!wxTheClipboard->SetData( data ))
   {
   }
 
   wxTextDataObject *data = new wxTextDataObject( text );
 
   if (!wxTheClipboard->SetData( data ))
   {

-     *m_text << "Error while copying to the clipboard." << "\n";
+     *m_text << "Error while copying to the clipboard.\n";

   }
   else
   {
   }
   else
   {

-     *m_text << "Successfully copied data to the clipboard." << "\n";
+     *m_text << "Successfully copied data to the clipboard.\n";

   }
 
   wxTheClipboard->Close();
 
   }
 
   wxTheClipboard->Close();
 

-  *m_text << "Closed the clipboard." << "\n";
-
+  *m_text << "Closed the clipboard.\n";
+#else
+  wxLogError("Your version of wxWindows is compiled without clipboard support.");

 #endif
 }
 
 #endif
 }
 


@@ -639,16 +636,16 @@ void MyPanel::OnPageChanged( wxNotebookEvent &event )
 
 void MyPanel::OnListBox( wxCommandEvent &event )
 {
 
 void MyPanel::OnListBox( wxCommandEvent &event )
 {

-  m_text->WriteText( "ListBox selection string is: " );
-  m_text->WriteText( event.GetString() );
-  m_text->WriteText( "\n" );
+  m_text->AppendText( "ListBox selection string is: " );
+  m_text->AppendText( event.GetString() );
+  m_text->AppendText( "\n" );

 }
 
 void MyPanel::OnListBoxDoubleClick( wxCommandEvent &event )
 {
 }
 
 void MyPanel::OnListBoxDoubleClick( wxCommandEvent &event )
 {

-  m_text->WriteText( "ListBox double click string is: " );
-  m_text->WriteText( event.GetString() );
-  m_text->WriteText( "\n" );
+  m_text->AppendText( "ListBox double click string is: " );
+  m_text->AppendText( event.GetString() );
+  m_text->AppendText( "\n" );

 }
 
 void MyPanel::OnListBoxButtons( wxCommandEvent &event )
 }
 
 void MyPanel::OnListBoxButtons( wxCommandEvent &event )


@@ -657,9 +654,9 @@ void MyPanel::OnListBoxButtons( wxCommandEvent &event )
   {
     case ID_LISTBOX_ENABLE:
     {
   {
     case ID_LISTBOX_ENABLE:
     {

-      m_text->WriteText("Checkbox clicked.\n");
-#ifdef __WXGTK__
+      m_text->AppendText("Checkbox clicked.\n");

       wxCheckBox *cb = (wxCheckBox*)event.GetEventObject();
       wxCheckBox *cb = (wxCheckBox*)event.GetEventObject();

+#if wxUSE_TOOLTIPS

       if (event.GetInt())
         cb->SetToolTip( "Click to enable listbox" );
       else
       if (event.GetInt())
         cb->SetToolTip( "Click to enable listbox" );
       else


@@ -705,9 +702,9 @@ void MyPanel::OnListBoxButtons( wxCommandEvent &event )
 
 void MyPanel::OnChoice( wxCommandEvent &event )
 {
 
 void MyPanel::OnChoice( wxCommandEvent &event )
 {

-  m_text->WriteText( "Choice selection string is: " );
-  m_text->WriteText( event.GetString() );
-  m_text->WriteText( "\n" );
+  m_text->AppendText( "Choice selection string is: " );
+  m_text->AppendText( event.GetString() );
+  m_text->AppendText( "\n" );

 }
 
 void MyPanel::OnChoiceButtons( wxCommandEvent &event )
 }
 
 void MyPanel::OnChoiceButtons( wxCommandEvent &event )


@@ -755,9 +752,9 @@ void MyPanel::OnChoiceButtons( wxCommandEvent &event )
 
 void MyPanel::OnCombo( wxCommandEvent &event )
 {
 
 void MyPanel::OnCombo( wxCommandEvent &event )
 {

-  m_text->WriteText( "ComboBox selection string is: " );
-  m_text->WriteText( event.GetString() );
-  m_text->WriteText( "\n" );
+  m_text->AppendText( "ComboBox selection string is: " );
+  m_text->AppendText( event.GetString() );
+  m_text->AppendText( "\n" );

 }
 
 void MyPanel::OnComboButtons( wxCommandEvent &event )
 }
 
 void MyPanel::OnComboButtons( wxCommandEvent &event )


@@ -805,9 +802,9 @@ void MyPanel::OnComboButtons( wxCommandEvent &event )
 
 void MyPanel::OnRadio( wxCommandEvent &event )
 {
 
 void MyPanel::OnRadio( wxCommandEvent &event )
 {

-  m_text->WriteText( "RadioBox selection string is: " );
-  m_text->WriteText( event.GetString() );
-  m_text->WriteText( "\n" );
+  m_text->AppendText( "RadioBox selection string is: " );
+  m_text->AppendText( event.GetString() );
+  m_text->AppendText( "\n" );

 }
 
 void MyPanel::OnRadioButtons( wxCommandEvent &event )
 }
 
 void MyPanel::OnRadioButtons( wxCommandEvent &event )


@@ -867,13 +864,14 @@ MyPanel::~MyPanel()
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(MINIMAL_QUIT,   MyFrame::OnQuit)
     EVT_MENU(MINIMAL_ABOUT,  MyFrame::OnAbout)
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(MINIMAL_QUIT,   MyFrame::OnQuit)
     EVT_MENU(MINIMAL_ABOUT,  MyFrame::OnAbout)

+    EVT_SIZE(MyFrame::OnSize)

     EVT_IDLE(MyFrame::OnIdle)
 END_EVENT_TABLE()
 
 MyFrame::MyFrame(wxFrame *frame, char *title, int x, int y, int w, int h)
        : wxFrame(frame, -1, title, wxPoint(x, y), wxSize(w, h))
 {
     EVT_IDLE(MyFrame::OnIdle)
 END_EVENT_TABLE()
 
 MyFrame::MyFrame(wxFrame *frame, char *title, int x, int y, int w, int h)
        : wxFrame(frame, -1, title, wxPoint(x, y), wxSize(w, h))
 {

-    CreateStatusBar();
+    CreateStatusBar(2);

 
     (void)new MyPanel( this, 10, 10, 300, 100 );
 }
 
     (void)new MyPanel( this, 10, 10, 300, 100 );
 }


@@ -889,6 +887,15 @@ void MyFrame::OnAbout( wxCommandEvent& WXUNUSED(event) )
   dialog.ShowModal();
 }
 
   dialog.ShowModal();
 }
 

+void MyFrame::OnSize( wxSizeEvent& event )
+{
+    wxString msg;
+    msg.Printf("%dx%d", event.GetSize().x, event.GetSize().y);
+    SetStatusText(msg, 1);
+
+    event.Skip();
+}
+

 void MyFrame::OnIdle( wxIdleEvent& WXUNUSED(event) )
 {
     // track the window which has the focus in the status bar
 void MyFrame::OnIdle( wxIdleEvent& WXUNUSED(event) )
 {
     // track the window which has the focus in the status bar


@@ -911,4 +918,4 @@ void MyFrame::OnIdle( wxIdleEvent& WXUNUSED(event) )
 
         SetStatusText(msg);
     }
 
         SetStatusText(msg);
     }

-}
\ No newline at end of file
+}