Added "const" to the (char *) type params that should have been const params

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

diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp
index 70715bb0754cb1efb91e48831e942981f1c28e18..06adc34fb2995d19f3080bb751f6cd235a04f163 100644 (file)
--- a/samples/dialogs/dialogs.cpp
+++ b/samples/dialogs/dialogs.cpp
@@ -25,12 +25,12 @@
 #include "wx/wx.h"
 #endif
 
 #include "wx/wx.h"
 #endif
 

-#include <wx/colordlg.h>
-#include <wx/filedlg.h>
-#include <wx/dirdlg.h>
-#include <wx/fontdlg.h>
-#include <wx/choicdlg.h>
-#include <wx/tipdlg.h>
+#include "wx/colordlg.h"
+#include "wx/filedlg.h"
+#include "wx/dirdlg.h"
+#include "wx/fontdlg.h"
+#include "wx/choicdlg.h"
+#include "wx/tipdlg.h"

 
 #define wxTEST_GENERIC_DIALOGS_IN_MSW 0
 
 
 #define wxTEST_GENERIC_DIALOGS_IN_MSW 0
 


@@ -56,7 +56,7 @@ bool MyApp::OnInit(void)
   m_canvasFont = *wxNORMAL_FONT;
 
   // Create the main frame window
   m_canvasFont = *wxNORMAL_FONT;
 
   // Create the main frame window

-  MyFrame *frame = new MyFrame((wxFrame *) NULL, (char *) "wxWindows dialogs example", wxPoint(50, 50), wxSize(400, 300));
+  MyFrame *frame = new MyFrame((wxFrame *) NULL, (char *) "wxWindows dialogs example", wxPoint(20, 20), wxSize(400, 300));

 
   // Make a menubar
   wxMenu *file_menu = new wxMenu;
 
   // Make a menubar
   wxMenu *file_menu = new wxMenu;


@@ -77,6 +77,7 @@ bool MyApp::OnInit(void)
   file_menu->AppendSeparator();
   file_menu->Append(DIALOGS_MESSAGE_BOX, "&Message box");
   file_menu->Append(DIALOGS_TEXT_ENTRY,  "Text &entry");
   file_menu->AppendSeparator();
   file_menu->Append(DIALOGS_MESSAGE_BOX, "&Message box");
   file_menu->Append(DIALOGS_TEXT_ENTRY,  "Text &entry");

+  file_menu->Append(DIALOGS_NUM_ENTRY, "&Numeric entry\tCtrl-N");

   file_menu->Append(DIALOGS_SINGLE_CHOICE,  "&Single choice");
   file_menu->AppendSeparator();
   file_menu->Append(DIALOGS_TIP,  "&Tip of the day");
   file_menu->Append(DIALOGS_SINGLE_CHOICE,  "&Single choice");
   file_menu->AppendSeparator();
   file_menu->Append(DIALOGS_TIP,  "&Tip of the day");


@@ -192,12 +193,35 @@ void MyFrame::ChooseFontGeneric(wxCommandEvent& WXUNUSED(event) )
 
 void MyFrame::MessageBox(wxCommandEvent& WXUNUSED(event) )
 {
 
 void MyFrame::MessageBox(wxCommandEvent& WXUNUSED(event) )
 {

-  wxMessageDialog dialog(NULL, "This is a message box\nA long, long string to test out the message box properly",
+  wxMessageDialog dialog( this, "This is a message box\nA long, long string to test out the message box properly",

       "Message box text", wxYES_NO|wxCANCEL|wxICON_INFORMATION);
 
   dialog.ShowModal();
 }
 
       "Message box text", wxYES_NO|wxCANCEL|wxICON_INFORMATION);
 
   dialog.ShowModal();
 }
 

+void MyFrame::NumericEntry(wxCommandEvent& WXUNUSED(event) )
+{
+    long res = wxGetNumberFromUser( "This is some text, actually a lot of text.\n"
+                                    "Even two rows of text.",
+                                   "Enter a number:", "Numeric input test",
+                                     50, 0, 100, this );
+
+    wxString msg;
+    int icon;
+    if ( res == -1 )
+    {
+        msg = "Invalid number entered or dialog cancelled.";
+        icon = wxICON_HAND;
+    }
+    else
+    {            
+       msg.Printf(_T("You've entered %lu"), res );
+        icon = wxICON_INFORMATION;
+    }
+
+    wxMessageBox(msg, "Numeric test result", wxOK | icon, this);
+}
+

 void MyFrame::TextEntry(wxCommandEvent& WXUNUSED(event) )
 {
   wxTextEntryDialog dialog(this, "This is a small sample\nA long, long string to test out the text entrybox",
 void MyFrame::TextEntry(wxCommandEvent& WXUNUSED(event) )
 {
   wxTextEntryDialog dialog(this, "This is a small sample\nA long, long string to test out the text entrybox",


@@ -247,7 +271,7 @@ void MyFrame::FileOpen(wxCommandEvent& WXUNUSED(event) )
 
 void MyFrame::FileSave(wxCommandEvent& WXUNUSED(event) )
 {
 
 void MyFrame::FileSave(wxCommandEvent& WXUNUSED(event) )
 {

-    wxFileDialog dialog(this, "Testing save file dialog", "", "",
+    wxFileDialog dialog(this, "Testing save file dialog", "", "myletter.txt",

         "Text files (*.txt)|*.txt|Document files (*.doc)|*.doc",
         wxSAVE|wxOVERWRITE_PROMPT);
 
         "Text files (*.txt)|*.txt|Document files (*.doc)|*.doc",
         wxSAVE|wxOVERWRITE_PROMPT);
 


@@ -262,7 +286,11 @@ void MyFrame::FileSave(wxCommandEvent& WXUNUSED(event) )
 
 void MyFrame::DirChoose(wxCommandEvent& WXUNUSED(event) )
 {
 
 void MyFrame::DirChoose(wxCommandEvent& WXUNUSED(event) )
 {

-    wxDirDialog dialog(this, "Testing directory picker", "");
+    // pass some initial dir to wxDirDialog
+    wxString dirHome;
+    wxGetHomeDir(&dirHome);
+
+    wxDirDialog dialog(this, "Testing directory picker", dirHome);

 
     if (dialog.ShowModal() == wxID_OK)
     {
 
     if (dialog.ShowModal() == wxID_OK)
     {


@@ -273,6 +301,7 @@ void MyFrame::DirChoose(wxCommandEvent& WXUNUSED(event) )
 
 void MyFrame::ShowTip(wxCommandEvent& event)
 {
 
 void MyFrame::ShowTip(wxCommandEvent& event)
 {

+#if wxUSE_STARTUP_TIPS

     static size_t s_index = (size_t)-1;
 
     if ( s_index == (size_t)-1 )
     static size_t s_index = (size_t)-1;
 
     if ( s_index == (size_t)-1 )


@@ -296,6 +325,7 @@ void MyFrame::ShowTip(wxCommandEvent& event)
 
     s_index = tipProvider->GetCurrentTip();
     delete tipProvider;
 
     s_index = tipProvider->GetCurrentTip();
     delete tipProvider;

+#endif

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


@@ -321,6 +351,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(DIALOGS_CHOOSE_FONT,                MyFrame::ChooseFont)
     EVT_MENU(DIALOGS_MESSAGE_BOX,                MyFrame::MessageBox)
     EVT_MENU(DIALOGS_TEXT_ENTRY,                MyFrame::TextEntry)
     EVT_MENU(DIALOGS_CHOOSE_FONT,                MyFrame::ChooseFont)
     EVT_MENU(DIALOGS_MESSAGE_BOX,                MyFrame::MessageBox)
     EVT_MENU(DIALOGS_TEXT_ENTRY,                MyFrame::TextEntry)

+    EVT_MENU(DIALOGS_NUM_ENTRY,                MyFrame::NumericEntry)

     EVT_MENU(DIALOGS_SINGLE_CHOICE,                MyFrame::SingleChoice)
     EVT_MENU(DIALOGS_FILE_OPEN,                    MyFrame::FileOpen)
     EVT_MENU(DIALOGS_FILE_SAVE,                    MyFrame::FileSave)
     EVT_MENU(DIALOGS_SINGLE_CHOICE,                MyFrame::SingleChoice)
     EVT_MENU(DIALOGS_FILE_OPEN,                    MyFrame::FileOpen)
     EVT_MENU(DIALOGS_FILE_SAVE,                    MyFrame::FileSave)