Patch from Joe "shmengie" Brown joebrown@podiatryfl.com

[wxWidgets.git] / contrib / samples / gizmos / led / led.cpp

diff --git a/contrib/samples/gizmos/led/led.cpp b/contrib/samples/gizmos/led/led.cpp
index d1651fb0f37808982af162b2cfc35895669bbe60..5de6f0f5135b15d105c4cb3634cd498e8caa41b2 100644 (file)
--- a/contrib/samples/gizmos/led/led.cpp
+++ b/contrib/samples/gizmos/led/led.cpp
@@ -25,12 +25,12 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
 #endif
 
 // for all others, include the necessary headers (this file is usually all you

-// need because it includes almost all "standard" wxWindows headers)
+// need because it includes almost all "standard" wxWidgets headers)

 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif
 
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif
 

-#include "../../../include/wx/gizmos/ledctrl.h"
+#include "wx/gizmos/ledctrl.h"

 #include "wx/sizer.h"
 #include "wx/panel.h"
 #include "wx/numdlg.h"
 #include "wx/sizer.h"
 #include "wx/panel.h"
 #include "wx/numdlg.h"


@@ -46,6 +46,8 @@ public:
 
     void OnIncrement();
     void OnDecrement();
 
     void OnIncrement();
     void OnDecrement();

+    void OnSmallIncrement();
+    void OnSmallDecrement();

     void OnSetValue();
     void OnAlignLeft();
     void OnAlignCenter();
     void OnSetValue();
     void OnAlignLeft();
     void OnAlignCenter();


@@ -54,6 +56,7 @@ public:
 
 private:
     wxLEDNumberCtrl    *m_led;
 
 private:
     wxLEDNumberCtrl    *m_led;

+    wxBoxSizer         *m_sizer;

 };
 
 // Define a new application type, each program should derive a class from wxApp
 };
 
 // Define a new application type, each program should derive a class from wxApp


@@ -81,6 +84,8 @@ public:
     void OnQuit(wxCommandEvent& event);
     void OnIncrement(wxCommandEvent& event);
     void OnDecrement(wxCommandEvent& event);
     void OnQuit(wxCommandEvent& event);
     void OnIncrement(wxCommandEvent& event);
     void OnDecrement(wxCommandEvent& event);

+    void OnSmallIncrement(wxCommandEvent& event);
+    void OnSmallDecrement(wxCommandEvent& event);

     void OnSetValue(wxCommandEvent& event);
     void OnAlignLeft(wxCommandEvent& event);
     void OnAlignCenter(wxCommandEvent& event);
     void OnSetValue(wxCommandEvent& event);
     void OnAlignLeft(wxCommandEvent& event);
     void OnAlignCenter(wxCommandEvent& event);


@@ -91,7 +96,7 @@ public:
 private:
     MyPanel  *m_panel;
 
 private:
     MyPanel  *m_panel;
 

-    // any class wishing to process wxWindows events must use this macro
+    // any class wishing to process wxWidgets events must use this macro

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 


@@ -103,10 +108,12 @@ private:
 enum
 {
     // menu items
 enum
 {
     // menu items

-    LED_Quit = 1,
+    LED_Quit = wxID_EXIT,

 
 

-    LED_Edit_Increment,
+    LED_Edit_Increment = wxID_HIGHEST + 1,

     LED_Edit_Decrement,
     LED_Edit_Decrement,

+    LED_Edit_Small_Increment,
+    LED_Edit_Small_Decrement,

     LED_Edit_SetValue,
     LED_Edit_AlignLeft,
     LED_Edit_AlignCenter,
     LED_Edit_SetValue,
     LED_Edit_AlignLeft,
     LED_Edit_AlignCenter,


@@ -116,23 +123,22 @@ enum
     // it is important for the id corresponding to the "About" command to have
     // this standard value as otherwise it won't be handled properly under Mac
     // (where it is special and put into the "Apple" menu)
     // it is important for the id corresponding to the "About" command to have
     // this standard value as otherwise it won't be handled properly under Mac
     // (where it is special and put into the "Apple" menu)

-    LED_About = wxID_ABOUT,
-
-    MY_PANEL,
-    MY_LED
+    LED_About = wxID_ABOUT

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

-// event tables and other macros for wxWindows
+// event tables and other macros for wxWidgets

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-// the event tables connect the wxWindows events with the functions (event
+// the event tables connect the wxWidgets events with the functions (event

 // handlers) which process them. It can be also done at run-time, but for the
 // simple menu events like this the static method is much simpler.
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(LED_Quit,  MyFrame::OnQuit)
     EVT_MENU(LED_Edit_Increment, MyFrame::OnIncrement)
     EVT_MENU(LED_Edit_Decrement, MyFrame::OnDecrement)
 // handlers) which process them. It can be also done at run-time, but for the
 // simple menu events like this the static method is much simpler.
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(LED_Quit,  MyFrame::OnQuit)
     EVT_MENU(LED_Edit_Increment, MyFrame::OnIncrement)
     EVT_MENU(LED_Edit_Decrement, MyFrame::OnDecrement)

+    EVT_MENU(LED_Edit_Small_Increment, MyFrame::OnSmallIncrement)
+    EVT_MENU(LED_Edit_Small_Decrement, MyFrame::OnSmallDecrement)

     EVT_MENU(LED_Edit_SetValue, MyFrame::OnSetValue)
     EVT_MENU(LED_Edit_AlignLeft, MyFrame::OnAlignLeft)
     EVT_MENU(LED_Edit_AlignCenter, MyFrame::OnAlignCenter)
     EVT_MENU(LED_Edit_SetValue, MyFrame::OnSetValue)
     EVT_MENU(LED_Edit_AlignLeft, MyFrame::OnAlignLeft)
     EVT_MENU(LED_Edit_AlignCenter, MyFrame::OnAlignCenter)


@@ -141,7 +147,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(LED_About, MyFrame::OnAbout)
 END_EVENT_TABLE()
 
     EVT_MENU(LED_About, MyFrame::OnAbout)
 END_EVENT_TABLE()
 

-// Create a new application object: this macro will allow wxWindows to create
+// Create a new application object: this macro will allow wxWidgets to create

 // the application object during program execution (it's better than using a
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
 // the application object during program execution (it's better than using a
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and


@@ -161,16 +167,16 @@ bool MyApp::OnInit()
 {
     // create the main application window
     MyFrame *frame = new MyFrame(_T("LED App"),
 {
     // create the main application window
     MyFrame *frame = new MyFrame(_T("LED App"),

-                                 wxPoint(50, 50), wxSize(450, 340));
+                                 wxDefaultPosition, wxSize(450, 120));

 
     // and show it (the frames, unlike simple controls, are not shown when
     // created initially)
 
     // and show it (the frames, unlike simple controls, are not shown when
     // created initially)

-    frame->Show(TRUE);
+    frame->Show(true);

 
     // success: wxApp::OnRun() will be called which will enter the main message
 
     // success: wxApp::OnRun() will be called which will enter the main message

-    // loop and the application will run. If we returned FALSE here, the
+    // loop and the application will run. If we returned false here, the

     // application would exit immediately.
     // application would exit immediately.

-    return TRUE;
+    return true;

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


@@ -179,7 +185,7 @@ bool MyApp::OnInit()
 
 // frame constructor
 MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size, long style)
 
 // frame constructor
 MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size, long style)

-       : wxFrame(NULL, -1, title, pos, size, style)
+       : wxFrame(NULL, wxID_ANY, title, pos, size, style)

 {
 #if wxUSE_MENUS
     // create a menu bar
 {
 #if wxUSE_MENUS
     // create a menu bar


@@ -192,8 +198,10 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size,
     menuFile->Append(LED_Quit, _T("E&xit\tAlt-X"), _T("Quit this program"));
 
     wxMenu *editMenu = new wxMenu;
     menuFile->Append(LED_Quit, _T("E&xit\tAlt-X"), _T("Quit this program"));
 
     wxMenu *editMenu = new wxMenu;

-    editMenu->Append(LED_Edit_Increment, _T("&Increment LED\tCtrl-I"));
-    editMenu->Append(LED_Edit_Decrement, _T("&Decrement LED\tCtrl-D"));
+    editMenu->Append(LED_Edit_Increment, _T("&Increment LED (1)\tCtrl-I"));
+    editMenu->Append(LED_Edit_Small_Increment, _T("&Increment LED (0.01)\tAlt-I"));
+    editMenu->Append(LED_Edit_Decrement, _T("&Decrement LED (1)\tCtrl-D"));
+    editMenu->Append(LED_Edit_Small_Decrement, _T("&Decrement LED (0.01)\tAlt-D"));

     editMenu->Append(LED_Edit_SetValue, _T("&Set LED Value...\tCtrl-S"));
     editMenu->AppendSeparator();
     editMenu->AppendRadioItem(LED_Edit_AlignLeft, _T("Align &Left"));
     editMenu->Append(LED_Edit_SetValue, _T("&Set LED Value...\tCtrl-S"));
     editMenu->AppendSeparator();
     editMenu->AppendRadioItem(LED_Edit_AlignLeft, _T("Align &Left"));


@@ -202,7 +210,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size,
     editMenu->AppendSeparator();
     editMenu->AppendCheckItem(LED_Edit_DrawFaded, _T("Draw &Faded\tCtrl-F"));
 
     editMenu->AppendSeparator();
     editMenu->AppendCheckItem(LED_Edit_DrawFaded, _T("Draw &Faded\tCtrl-F"));
 

-    editMenu->Check(LED_Edit_DrawFaded, TRUE);
+    editMenu->Check(LED_Edit_DrawFaded, true);

 
     // now append the freshly created menu to the menu bar...
     wxMenuBar *menuBar = new wxMenuBar();
 
     // now append the freshly created menu to the menu bar...
     wxMenuBar *menuBar = new wxMenuBar();


@@ -222,8 +230,8 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size,
 
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {

-    // TRUE is to force the frame to close
-    Close(TRUE);
+    // true is to force the frame to close
+    Close(true);

 }
 
 void MyFrame::OnIncrement(wxCommandEvent& WXUNUSED(event))
 }
 
 void MyFrame::OnIncrement(wxCommandEvent& WXUNUSED(event))


@@ -236,6 +244,16 @@ void MyFrame::OnDecrement(wxCommandEvent& WXUNUSED(event))
     m_panel->OnDecrement();
 }
 
     m_panel->OnDecrement();
 }
 

+void MyFrame::OnSmallIncrement(wxCommandEvent& WXUNUSED(event))
+{
+    m_panel->OnSmallIncrement();
+}
+
+void MyFrame::OnSmallDecrement(wxCommandEvent& WXUNUSED(event))
+{
+    m_panel->OnSmallDecrement();
+}
+

 void MyFrame::OnSetValue(wxCommandEvent& WXUNUSED(event))
 {
     m_panel->OnSetValue();
 void MyFrame::OnSetValue(wxCommandEvent& WXUNUSED(event))
 {
     m_panel->OnSetValue();


@@ -275,50 +293,70 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 // --------------------------------------------------------------------------
 
 MyPanel::MyPanel(wxFrame *frame)
 // --------------------------------------------------------------------------
 
 MyPanel::MyPanel(wxFrame *frame)

-                : wxPanel(frame, MY_PANEL)
+                : wxPanel(frame, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxCLIP_CHILDREN)

 {
 {

-    m_led = new wxLEDNumberCtrl(this, MY_LED,
-                                wxPoint(20, 20), wxSize(300, 200),
-                                wxLED_ALIGN_LEFT | wxLED_DRAW_FADED);
+    m_led = new wxLEDNumberCtrl(this, wxID_ANY,
+                                wxDefaultPosition, wxDefaultSize,
+                                wxLED_ALIGN_LEFT|wxLED_DRAW_FADED|wxFULL_REPAINT_ON_RESIZE);
+
+    m_led->SetValue(_T("01.23 7-8-9"));
+
+    m_sizer = new wxBoxSizer(wxVERTICAL);
+    m_sizer->Add(m_led, 1, wxEXPAND|wxALL, 10);
+    m_sizer->Fit(this);

 
 

-    m_led->SetValue(_T("50"));
+    SetSizer(m_sizer);
+    SetAutoLayout(true);

 }
 
 void MyPanel::OnIncrement()
 {
     wxString strValue = m_led->GetValue();
 }
 
 void MyPanel::OnIncrement()
 {
     wxString strValue = m_led->GetValue();

-    if ( strValue == _T("99") )
-        return;

 
 

-    long lValue;
-    strValue.ToLong(&lValue);
-    ++lValue;
-    m_led->SetValue(wxString::Format(_T("%ld"), lValue));
+    double dValue;
+    strValue.ToDouble(&dValue);
+    dValue += 1.0;
+    m_led->SetValue(wxString::Format(_T("%.2f"), dValue));

 }
 
 void MyPanel::OnDecrement()
 {
     wxString strValue = m_led->GetValue();
 
 }
 
 void MyPanel::OnDecrement()
 {
     wxString strValue = m_led->GetValue();
 

-    long lValue;
-    strValue.ToLong(&lValue);
-    if (lValue == 0)
-        return;
+    double dValue;
+    strValue.ToDouble(&dValue);
+    dValue -= 1.0;
+    m_led->SetValue(wxString::Format(_T("%.2f"), dValue));
+}
+
+void MyPanel::OnSmallIncrement()
+{
+    wxString strValue = m_led->GetValue();
+
+    double dValue;
+    strValue.ToDouble(&dValue);
+    dValue += 0.01;
+    m_led->SetValue(wxString::Format(_T("%.2f"), dValue));
+}
+
+void MyPanel::OnSmallDecrement()
+{
+    wxString strValue = m_led->GetValue();

 
 

-    --lValue;
-    m_led->SetValue(wxString::Format(_T("%ld"), lValue));
+    double dValue;
+    strValue.ToDouble(&dValue);
+    dValue -= 0.01;
+    m_led->SetValue(wxString::Format(_T("%.2f"), dValue));

 }
 
 void MyPanel::OnSetValue()
 {
     wxString strValue = m_led->GetValue();
 
 }
 
 void MyPanel::OnSetValue()
 {
     wxString strValue = m_led->GetValue();
 

-    long lValue;
-    strValue.ToLong(&lValue);
-    lValue = ::wxGetNumberFromUser(_T("Please enter a number between 0 and 99"), _T(""), _T("Please enter a number"), lValue, 0, 99, this);
+    strValue = ::wxGetTextFromUser(_T("Please enter a number for LED display"), _T("Please enter a number"), strValue, this);

 
 

-    if (lValue != -1)
-        m_led->SetValue(wxString::Format(_T("%ld"), lValue));
+    if (strValue != _T(""))
+        m_led->SetValue(strValue);

 }
 
 void MyPanel::OnAlignLeft()
 }
 
 void MyPanel::OnAlignLeft()