Script updates

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

diff --git a/samples/ownerdrw/ownerdrw.cpp b/samples/ownerdrw/ownerdrw.cpp
index c0e47b4b8b7b0d1816f31d5550fc7d09c63ae975..38249693838bfec028394e1eab9311ec8425e391 100644 (file)
--- a/samples/ownerdrw/ownerdrw.cpp
+++ b/samples/ownerdrw/ownerdrw.cpp
@@ -2,7 +2,7 @@
 // Name:        ownerdrw.cpp
 // Purpose:     Owner-draw sample, for Windows
 // Author:      Vadim Zeitlin
 // Name:        ownerdrw.cpp
 // Purpose:     Owner-draw sample, for Windows
 // Author:      Vadim Zeitlin

-// Modified by: 
+// Modified by:

 // Created:     13.11.97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Created:     13.11.97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>


@@ -41,7 +41,7 @@ class OwnerDrawnFrame : public wxFrame
 public:
     // ctor & dtor
     OwnerDrawnFrame(wxFrame *frame, wxChar *title, int x, int y, int w, int h);
 public:
     // ctor & dtor
     OwnerDrawnFrame(wxFrame *frame, wxChar *title, int x, int y, int w, int h);

-    ~OwnerDrawnFrame();
+    ~OwnerDrawnFrame(){};

 
     // notifications
     void OnQuit             (wxCommandEvent& event);
 
     // notifications
     void OnQuit             (wxCommandEvent& event);


@@ -61,12 +61,12 @@ private:
     wxMenuItem *pAboutItem;
 };
 
     wxMenuItem *pAboutItem;
 };
 

-enum 
+enum

 {
 {

-    Menu_Quit = 1, 
+    Menu_Quit = 1,

     Menu_First = 100,
     Menu_First = 100,

-    Menu_Test1, Menu_Test2, Menu_Test3, 
-    Menu_Bitmap, Menu_Bitmap2, 
+    Menu_Test1, Menu_Test2, Menu_Test3,
+    Menu_Bitmap, Menu_Bitmap2,

     Menu_Submenu, Menu_Sub1, Menu_Sub2, Menu_Sub3,
     Menu_Toggle, Menu_About,
     Control_First = 1000,
     Menu_Submenu, Menu_Sub1, Menu_Sub2, Menu_Sub3,
     Menu_Toggle, Menu_About,
     Control_First = 1000,


@@ -79,7 +79,7 @@ BEGIN_EVENT_TABLE(OwnerDrawnFrame, wxFrame)
     EVT_MENU(Menu_Quit, OwnerDrawnFrame::OnQuit)
     EVT_LISTBOX(Control_Listbox, OwnerDrawnFrame::OnListboxSelect)
     EVT_CHECKLISTBOX(Control_Listbox, OwnerDrawnFrame::OnCheckboxToggle)
     EVT_MENU(Menu_Quit, OwnerDrawnFrame::OnQuit)
     EVT_LISTBOX(Control_Listbox, OwnerDrawnFrame::OnListboxSelect)
     EVT_CHECKLISTBOX(Control_Listbox, OwnerDrawnFrame::OnCheckboxToggle)

-    EVT_COMMAND(Control_Listbox, wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, 
+    EVT_COMMAND(Control_Listbox, wxEVT_COMMAND_LISTBOX_DOUBLECLICKED,

                 OwnerDrawnFrame::OnListboxDblClick)
 END_EVENT_TABLE()
 
                 OwnerDrawnFrame::OnListboxDblClick)
 END_EVENT_TABLE()
 


@@ -176,13 +176,13 @@ void OwnerDrawnFrame::InitMenu()
     file_menu->Append(pItem);
 
     file_menu->AppendSeparator();
     file_menu->Append(pItem);
 
     file_menu->AppendSeparator();

-    pItem = new wxMenuItem(file_menu, Menu_Toggle, _T("&Disable/Enable\tCtrl+D"), 
+    pItem = new wxMenuItem(file_menu, Menu_Toggle, _T("&Disable/Enable\tCtrl+D"),

                           _T("enables/disables the About-Item"), wxITEM_NORMAL);
     pItem->SetFont(*wxNORMAL_FONT);
     file_menu->Append(pItem);
 
     // Of course Ctrl+RatherLongAccel will not work in this example:
                           _T("enables/disables the About-Item"), wxITEM_NORMAL);
     pItem->SetFont(*wxNORMAL_FONT);
     file_menu->Append(pItem);
 
     // Of course Ctrl+RatherLongAccel will not work in this example:

-    pAboutItem = new wxMenuItem(file_menu, Menu_About, _T("&About\tCtrl+RatherLongAccel"), 
+    pAboutItem = new wxMenuItem(file_menu, Menu_About, _T("&About\tCtrl+RatherLongAccel"),

                                 _T("display program information"), wxITEM_NORMAL);
     pAboutItem->SetBitmap(bmpInfo);
     pAboutItem->SetDisabledBitmap(bmpInfo_mono);
                                 _T("display program information"), wxITEM_NORMAL);
     pAboutItem->SetBitmap(bmpInfo);
     pAboutItem->SetDisabledBitmap(bmpInfo_mono);


@@ -212,17 +212,19 @@ OwnerDrawnFrame::OwnerDrawnFrame(wxFrame *frame, wxChar *title,
     // create the menu
     InitMenu();
 
     // create the menu
     InitMenu();
 

+#if wxUSE_STATUSBAR

     // create the status line
     const int widths[] = { -1, 60 };
     CreateStatusBar(2);
     SetStatusWidths(2, widths);
     SetStatusText(_T("no selection"), 0);
     // create the status line
     const int widths[] = { -1, 60 };
     CreateStatusBar(2);
     SetStatusWidths(2, widths);
     SetStatusText(_T("no selection"), 0);

+#endif // wxUSE_STATUSBAR

 
     // make a panel with some controls
     wxPanel *pPanel = new wxPanel(this);
 
     // check list box
 
     // make a panel with some controls
     wxPanel *pPanel = new wxPanel(this);
 
     // check list box

-    static const wxChar* aszChoices[] = { _T("Hello"), _T("world"), _T("and"), 
+    static const wxChar* aszChoices[] = { _T("Hello"), _T("world"), _T("and"),

                                           _T("goodbye"), _T("cruel"), _T("world"),
                                           _T("-------"), _T("owner-drawn"), _T("listbox") };
 
                                           _T("goodbye"), _T("cruel"), _T("world"),
                                           _T("-------"), _T("owner-drawn"), _T("listbox") };
 


@@ -254,7 +256,7 @@ OwnerDrawnFrame::OwnerDrawnFrame(wxFrame *frame, wxChar *title,
 
     // normal (but owner-drawn) listbox
     static const wxChar* aszColors[] = { _T("Red"), _T("Blue"), _T("Pink"),
 
     // normal (but owner-drawn) listbox
     static const wxChar* aszColors[] = { _T("Red"), _T("Blue"), _T("Pink"),

-                                         _T("Green"), _T("Yellow"), 
+                                         _T("Green"), _T("Yellow"),

                                          _T("Black"), _T("Violet")  };
 
     astrChoices = new wxString[WXSIZEOF(aszColors)];
                                          _T("Black"), _T("Violet")  };
 
     astrChoices = new wxString[WXSIZEOF(aszColors)];


@@ -277,17 +279,17 @@ OwnerDrawnFrame::OwnerDrawnFrame(wxFrame *frame, wxChar *title,
 
 #if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
 
 
 #if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
 

-    struct { unsigned int r, g, b; } aColors[] =
+    struct { unsigned char r, g, b; } aColors[] =

         {
             {255,0,0}, {0,0,255}, {255,128,192},
         {
             {255,0,0}, {0,0,255}, {255,128,192},

-            {0,255,0}, {255,255,128}, 
+            {0,255,0}, {255,255,128},

             {0,0,0}, {128,0,255}
         };
 
     for ( ui = 0; ui < WXSIZEOF(aszColors); ui++ )
     {
         pListBox->GetItem(ui)->SetTextColour(wxColor(aColors[ui].r,
             {0,0,0}, {128,0,255}
         };
 
     for ( ui = 0; ui < WXSIZEOF(aszColors); ui++ )
     {
         pListBox->GetItem(ui)->SetTextColour(wxColor(aColors[ui].r,

-                                                     aColors[ui].g, 
+                                                     aColors[ui].g,

                                                      aColors[ui].b));
         // yellow on white is horrible...
         if ( ui == 4 )
                                                      aColors[ui].b));
         // yellow on white is horrible...
         if ( ui == 4 )


@@ -305,10 +307,6 @@ OwnerDrawnFrame::OwnerDrawnFrame(wxFrame *frame, wxChar *title,
     Show(true);
 }
 
     Show(true);
 }
 

-OwnerDrawnFrame::~OwnerDrawnFrame()
-{
-}
-

 void OwnerDrawnFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
     Close(true);
 void OwnerDrawnFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
     Close(true);


@@ -332,11 +330,15 @@ void OwnerDrawnFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 
 void OwnerDrawnFrame::OnListboxSelect(wxCommandEvent& event)
 {
 
 void OwnerDrawnFrame::OnListboxSelect(wxCommandEvent& event)
 {

+#if wxUSE_STATUSBAR

     wxString strSelection;
     unsigned int nSel = event.GetSelection();
     strSelection.Printf(wxT("item %d selected (%schecked)"), nSel,
                         m_pListBox->IsChecked(nSel) ? wxT("") : wxT("not "));
     SetStatusText(strSelection);
     wxString strSelection;
     unsigned int nSel = event.GetSelection();
     strSelection.Printf(wxT("item %d selected (%schecked)"), nSel,
                         m_pListBox->IsChecked(nSel) ? wxT("") : wxT("not "));
     SetStatusText(strSelection);

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

 }
 
 void OwnerDrawnFrame::OnListboxDblClick(wxCommandEvent& WXUNUSED(event))
 }
 
 void OwnerDrawnFrame::OnListboxDblClick(wxCommandEvent& WXUNUSED(event))


@@ -350,9 +352,13 @@ void OwnerDrawnFrame::OnListboxDblClick(wxCommandEvent& WXUNUSED(event))
 
 void OwnerDrawnFrame::OnCheckboxToggle(wxCommandEvent& event)
 {
 
 void OwnerDrawnFrame::OnCheckboxToggle(wxCommandEvent& event)
 {

+#if wxUSE_STATUSBAR

     wxString strSelection;
     unsigned int nItem = event.GetInt();
     strSelection.Printf(wxT("item %d was %schecked"), nItem,
                         m_pListBox->IsChecked(nItem) ? wxT("") : wxT("un"));
     SetStatusText(strSelection);
     wxString strSelection;
     unsigned int nItem = event.GetInt();
     strSelection.Printf(wxT("item %d was %schecked"), nItem,
                         m_pListBox->IsChecked(nItem) ? wxT("") : wxT("un"));
     SetStatusText(strSelection);

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

 }
 }