1. added wxGetNumberFromUser (to textdlgg.cpp and dialogs sample)

2. wxTE_RICH style added to wxMSW, the text controls don't use RICHEDIT
   class by default any more
3. wxRadioBox doesn't generate button events any more (grrr...)
4. commented out code in log.cpp restored and a bug corrected


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3088 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

samples/dialogs/dialogs.cpp

@@ -78,6 +78,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->Append(DIALOGS_NUM_ENTRY, "&Numeric entry\tCtrl-N");
   file_menu->Append(DIALOGS_SINGLE_CHOICE,  "&Single choice");
   file_menu->Append(DIALOGS_EXT_DIALOG,  "&Extended dialog");
   file_menu->AppendSeparator();
@@ -237,6 +238,27 @@ void MyFrame::MessageBox(wxCommandEvent& WXUNUSED(event) )
   dialog.ShowModal();
 }
 
+void MyFrame::NumericEntry(wxCommandEvent& WXUNUSED(event) )
+{
+    long res = wxGetNumberFromUser("", "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("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",
@@ -362,6 +384,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_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)

samples/dialogs/dialogs.h

@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __DIALOGSH__
@@ -14,8 +14,9 @@
 
 // Define a new application type
 class MyApp: public wxApp
-{ public:
-    bool OnInit(void);
+{
+public:
+    bool OnInit();
 
     wxFont       m_canvasFont;
     wxColour     m_canvasTextColour;
@@ -23,15 +24,17 @@ class MyApp: public wxApp
 
 // Define a new frame type
 class MyFrame: public wxFrame
-{ public:
-    MyFrame(wxWindow *parent, const wxString& title, const wxPoint& pos,
-		const wxSize& size);
+{
+public:
+    MyFrame(wxWindow *parent, const wxString& title,
+            const wxPoint& pos, const wxSize& size);
 
     void ChooseColour(wxCommandEvent& event);
     void ChooseFont(wxCommandEvent& event);
     void MessageBox(wxCommandEvent& event);
     void SingleChoice(wxCommandEvent& event);
     void TextEntry(wxCommandEvent& event);
+    void NumericEntry(wxCommandEvent& event);
     void FileOpen(wxCommandEvent& event);
     void FileSave(wxCommandEvent& event);
     void DirChoose(wxCommandEvent& event);
@@ -42,20 +45,20 @@ class MyFrame: public wxFrame
     void ChooseColourGeneric(wxCommandEvent& event);
     void ChooseFontGeneric(wxCommandEvent& event);
 #endif
+
     void OnExit(wxCommandEvent& event);
-	
+
   DECLARE_EVENT_TABLE()
 };
 
 class MyCanvas: public wxScrolledWindow
 {
- public:
-  MyCanvas(wxWindow *parent):
-      wxScrolledWindow(parent)
-    {
-    }
-  void OnPaint(wxPaintEvent& event);
-DECLARE_EVENT_TABLE()
+public:
+    MyCanvas(wxWindow *parent) : wxScrolledWindow(parent) { }
+
+    void OnPaint(wxPaintEvent& event);
+
+    DECLARE_EVENT_TABLE()
 };
 
 
@@ -72,6 +75,7 @@ DECLARE_EVENT_TABLE()
 #define DIALOGS_DIR_CHOOSE                  10
 #define DIALOGS_TIP                         11
 #define DIALOGS_EXT_DIALOG                  12
+#define DIALOGS_NUM_ENTRY                   13
 
 #endif