Added version test

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

diff --git a/samples/typetest/typetest.cpp b/samples/typetest/typetest.cpp
index 71507f11a1db93b6608832589a778dcc9483965a..695f8fec2b1a0f1e523639ac80497023a25ca8f4 100644 (file)
--- a/samples/typetest/typetest.cpp
+++ b/samples/typetest/typetest.cpp
@@ -108,14 +108,15 @@ bool MyApp::OnInit()
     menu_bar->Append(test_menu, _T("&Tests"));
     frame->SetMenuBar(menu_bar);
 
     menu_bar->Append(test_menu, _T("&Tests"));
     frame->SetMenuBar(menu_bar);
 

-    m_textCtrl = new wxTextCtrl(frame, -1, _T(""), wxPoint(0, 0), wxDefaultSize, wxTE_MULTILINE);
+    m_textCtrl = new wxTextCtrl(frame, wxID_ANY, wxEmptyString,
+        wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE);

 
     // Show the frame
 
     // Show the frame

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

 
     SetTopWindow(frame);
 
 
     SetTopWindow(frame);
 

-    return TRUE;
+    return true;

 }
 
 void MyApp::DoStreamDemo(wxCommandEvent& WXUNUSED(event))
 }
 
 void MyApp::DoStreamDemo(wxCommandEvent& WXUNUSED(event))


@@ -727,7 +728,6 @@ void MyApp::DoStreamDemo6(wxCommandEvent& WXUNUSED(event))
     textCtrl.WriteText( _T("\nTesting Ungetch():\n\n") );
 
     char ch = 0;
     textCtrl.WriteText( _T("\nTesting Ungetch():\n\n") );
 
     char ch = 0;

-    size_t pos = 0;

     wxString str;
 
     textCtrl.WriteText( _T("Writing number 0 to 9 to wxFileOutputStream...\n\n") );
     wxString str;
 
     textCtrl.WriteText( _T("Writing number 0 to 9 to wxFileOutputStream...\n\n") );


@@ -743,7 +743,7 @@ void MyApp::DoStreamDemo6(wxCommandEvent& WXUNUSED(event))
     wxFileInputStream file_input( wxString(_T("test_wx.dat")) );
 
     ch = file_input.GetC();
     wxFileInputStream file_input( wxString(_T("test_wx.dat")) );
 
     ch = file_input.GetC();

-    pos = file_input.TellI();
+    size_t pos = file_input.TellI();

     str.Printf( wxT("Read char: %d. Now at position %d\n\n"), (int) ch, (int) pos );
     textCtrl.WriteText( str );
 
     str.Printf( wxT("Read char: %d. Now at position %d\n\n"), (int) ch, (int) pos );
     textCtrl.WriteText( str );
 


@@ -807,7 +807,6 @@ void MyApp::DoStreamDemo7(wxCommandEvent& WXUNUSED(event))
     textCtrl.WriteText( _T("\nTesting Ungetch() in buffered input stream:\n\n") );
 
     char ch = 0;
     textCtrl.WriteText( _T("\nTesting Ungetch() in buffered input stream:\n\n") );
 
     char ch = 0;

-    size_t pos = 0;

     wxString str;
 
     textCtrl.WriteText( _T("Writing number 0 to 9 to wxFileOutputStream...\n\n") );
     wxString str;
 
     textCtrl.WriteText( _T("Writing number 0 to 9 to wxFileOutputStream...\n\n") );


@@ -824,7 +823,7 @@ void MyApp::DoStreamDemo7(wxCommandEvent& WXUNUSED(event))
     wxBufferedInputStream buf_input( file_input );
 
     ch = buf_input.GetC();
     wxBufferedInputStream buf_input( file_input );
 
     ch = buf_input.GetC();

-    pos = buf_input.TellI();
+    size_t pos = buf_input.TellI();

     str.Printf( wxT("Read char: %d. Now at position %d\n\n"), (int) ch, (int) pos );
     textCtrl.WriteText( str );
 
     str.Printf( wxT("Read char: %d. Now at position %d\n\n"), (int) ch, (int) pos );
     textCtrl.WriteText( str );
 


@@ -894,11 +893,6 @@ void MyApp::DoUnicodeDemo(wxCommandEvent& WXUNUSED(event))
     printf( "\n\nConversion with wxConvLocal:\n" );
     wxConvCurrent = &wxConvLocal;
     printf( (const char*) str.mbc_str() );
     printf( "\n\nConversion with wxConvLocal:\n" );
     wxConvCurrent = &wxConvLocal;
     printf( (const char*) str.mbc_str() );

-#if defined(__WXGTK__)
-    printf( "\n\nConversion with wxConvGdk:\n" );
-    wxConvCurrent = &wxConvGdk;
-    printf( (const char*) str.mbc_str() );
-#endif

     printf( "\n\nConversion with wxConvLibc:\n" );
     wxConvCurrent = &wxConvLibc;
     printf( (const char*) str.mbc_str() );
     printf( "\n\nConversion with wxConvLibc:\n" );
     wxConvCurrent = &wxConvLibc;
     printf( (const char*) str.mbc_str() );


@@ -963,7 +957,7 @@ void MyApp::DoMIMEDemo(wxCommandEvent& WXUNUSED(event))
             textCtrl << _T("MIME information about extension '") << ext << _T("'\n")
                      << _T("\tMIME type: ") << ( !type ? wxT("unknown")
                                                    : type.c_str() ) << '\n'
             textCtrl << _T("MIME information about extension '") << ext << _T("'\n")
                      << _T("\tMIME type: ") << ( !type ? wxT("unknown")
                                                    : type.c_str() ) << '\n'

-                     << _T("\tDescription: ") << ( !desc ? wxT("") : desc.c_str() )
+                     << _T("\tDescription: ") << ( !desc ? wxEmptyString : desc.c_str() )

                         << '\n'
                      << _T("\tCommand to open: ") << ( !open ? wxT("no") : open.c_str() )
                         << '\n';
                         << '\n'
                      << _T("\tCommand to open: ") << ( !open ? wxT("no") : open.c_str() )
                         << '\n';


@@ -981,27 +975,28 @@ void MyApp::DoByteOrderDemo(wxCommandEvent& WXUNUSED(event))
     textCtrl.Clear();
     textCtrl << _T("\nTest byte order macros:\n\n");
 
     textCtrl.Clear();
     textCtrl << _T("\nTest byte order macros:\n\n");
 

-    if (wxBYTE_ORDER == wxLITTLE_ENDIAN)
+    #if wxBYTE_ORDER == wxLITTLE_ENDIAN

         textCtrl << _T("This is a little endian system.\n\n");
         textCtrl << _T("This is a little endian system.\n\n");

-    else
+    #else

         textCtrl << _T("This is a big endian system.\n\n");
         textCtrl << _T("This is a big endian system.\n\n");

+    #endif

 
     wxString text;
 
     wxInt32 var = 0xF1F2F3F4;
 
     wxString text;
 
     wxInt32 var = 0xF1F2F3F4;

-    text = _T("");
+    text = wxEmptyString;

     text.Printf( _T("Value of wxInt32 is now: %#x.\n\n"), var );
     textCtrl.WriteText( text );
 
     text.Printf( _T("Value of wxInt32 is now: %#x.\n\n"), var );
     textCtrl.WriteText( text );
 

-    text = _T("");
+    text = wxEmptyString;

     text.Printf( _T("Value of swapped wxInt32 is: %#x.\n\n"), wxINT32_SWAP_ALWAYS( var ) );
     textCtrl.WriteText( text );
 
     text.Printf( _T("Value of swapped wxInt32 is: %#x.\n\n"), wxINT32_SWAP_ALWAYS( var ) );
     textCtrl.WriteText( text );
 

-    text = _T("");
+    text = wxEmptyString;

     text.Printf( _T("Value of wxInt32 swapped on little endian is: %#x.\n\n"), wxINT32_SWAP_ON_LE( var ) );
     textCtrl.WriteText( text );
 
     text.Printf( _T("Value of wxInt32 swapped on little endian is: %#x.\n\n"), wxINT32_SWAP_ON_LE( var ) );
     textCtrl.WriteText( text );
 

-    text = _T("");
+    text = wxEmptyString;

     text.Printf( _T("Value of wxInt32 swapped on big endian is: %#x.\n\n"), wxINT32_SWAP_ON_BE( var ) );
     textCtrl.WriteText( text );
 }
     text.Printf( _T("Value of wxInt32 swapped on big endian is: %#x.\n\n"), wxINT32_SWAP_ON_BE( var ) );
     textCtrl.WriteText( text );
 }


@@ -1029,10 +1024,8 @@ void MyApp::DoVariantDemo(wxCommandEvent& WXUNUSED(event) )
     long l = var1;
 
     // suppress compile warnings about unused variables
     long l = var1;
 
     // suppress compile warnings about unused variables

-    if ( l < v )
-    {
-        ;
-    }
+    wxUnusedVar(l);
+    wxUnusedVar(v);

 
     wxStringList stringList;
     stringList.Add(_T("one")); stringList.Add(_T("two")); stringList.Add(_T("three"));
 
     wxStringList stringList;
     stringList.Add(_T("one")); stringList.Add(_T("two")); stringList.Add(_T("three"));


@@ -1056,10 +1049,13 @@ void MyApp::DoVariantDemo(wxCommandEvent& WXUNUSED(event) )
     var1 = wxVariant(new wxFont(wxSystemSettings::GetFont(wxSYS_OEM_FIXED_FONT)));
     textCtrl << _T("var1 = (wxfont)\"");
     wxFont* font = wxGetVariantCast(var1,wxFont);
     var1 = wxVariant(new wxFont(wxSystemSettings::GetFont(wxSYS_OEM_FIXED_FONT)));
     textCtrl << _T("var1 = (wxfont)\"");
     wxFont* font = wxGetVariantCast(var1,wxFont);

-    if (font) {
-       textCtrl << font->GetNativeFontInfoDesc() << _T("\"\n");
-    } else {
-       textCtrl << _T("(null)\"\n");
+    if (font)
+    {
+        textCtrl << font->GetNativeFontInfoDesc() << _T("\"\n");
+    }
+    else
+    {
+        textCtrl << _T("(null)\"\n");

     }
 }
 
     }
 }
 


@@ -1070,21 +1066,21 @@ END_EVENT_TABLE()
 
 // My frame constructor
 MyFrame::MyFrame(wxFrame *parent, const wxString& title,
 
 // My frame constructor
 MyFrame::MyFrame(wxFrame *parent, const wxString& title,

-       const wxPoint& pos, const wxSize& size):
-  wxFrame(parent, -1, title, pos, size)
+    const wxPoint& pos, const wxSize& size)
+    : wxFrame(parent, wxID_ANY, title, pos, size)

 {}
 
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event) )
 {
 {}
 
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event) )
 {

-  Close(TRUE);
+    Close(true);

 }
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
 {
 }
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
 {

-  wxMessageDialog dialog(this, _T("Tests various wxWindows types"),
-      _T("About Types"), wxYES_NO|wxCANCEL);
+    wxMessageDialog dialog(this, _T("Tests various wxWindows types"),
+        _T("About Types"), wxYES_NO|wxCANCEL);

 
 

-  dialog.ShowModal();
+    dialog.ShowModal();

 }
 
 
 }