-1->wxID_ANY, TRUE->true and FALSE->false replacements.

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

diff --git a/samples/taskbar/tbtest.cpp b/samples/taskbar/tbtest.cpp
index 240abe59ff3984d413d5c308f47044c13e0a241c..e7be15d9b38aae69dbcd92cc063327e03e543fc1 100644 (file)
--- a/samples/taskbar/tbtest.cpp
+++ b/samples/taskbar/tbtest.cpp
@@ -36,11 +36,11 @@ IMPLEMENT_APP(MyApp)
 bool MyApp::OnInit(void)
 {
     // Create the main frame window
 bool MyApp::OnInit(void)
 {
     // Create the main frame window

-    dialog = new MyDialog(NULL, -1, wxT("wxTaskBarIcon Test Dialog"), wxPoint(-1, -1), wxSize(365, 290), wxDIALOG_MODELESS|wxDEFAULT_DIALOG_STYLE);
+    dialog = new MyDialog(NULL, wxID_ANY, wxT("wxTaskBarIcon Test Dialog"), wxDefaultPosition, wxSize(365, 290), wxDIALOG_MODELESS|wxDEFAULT_DIALOG_STYLE);

 
 

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

 
 

-    return TRUE;
+    return true;

 }
 
 
 }
 
 


@@ -66,12 +66,12 @@ MyDialog::~MyDialog()
 
 void MyDialog::OnOK(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyDialog::OnOK(wxCommandEvent& WXUNUSED(event))
 {

-    Show(FALSE);
+    Show(false);

 }
 
 void MyDialog::OnExit(wxCommandEvent& WXUNUSED(event))
 {
 }
 
 void MyDialog::OnExit(wxCommandEvent& WXUNUSED(event))
 {

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

 }
 
 void MyDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
 }
 
 void MyDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))


@@ -81,10 +81,10 @@ void MyDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
 
 void MyDialog::Init(void)
 {
 
 void MyDialog::Init(void)
 {

-  (void)new wxStaticText(this, -1, _T("Press OK to hide me, Exit to quit."),
+  (void)new wxStaticText(this, wxID_ANY, _T("Press OK to hide me, Exit to quit."),

                          wxPoint(10, 20));
 
                          wxPoint(10, 20));
 

-  (void)new wxStaticText(this, -1, _T("Double-click on the taskbar icon to show me again."),
+  (void)new wxStaticText(this, wxID_ANY, _T("Double-click on the taskbar icon to show me again."),

                          wxPoint(10, 40));
 
   (void)new wxButton(this, wxID_EXIT, _T("Exit"), wxPoint(185, 230), wxSize(80, 25));
                          wxPoint(10, 40));
 
   (void)new wxButton(this, wxID_EXIT, _T("Exit"), wxPoint(185, 230), wxSize(80, 25));


@@ -115,12 +115,12 @@ END_EVENT_TABLE()
 
 void MyTaskBarIcon::OnMenuRestore(wxCommandEvent& )
 {
 
 void MyTaskBarIcon::OnMenuRestore(wxCommandEvent& )
 {

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

 }
 
 void MyTaskBarIcon::OnMenuExit(wxCommandEvent& )
 {
 }
 
 void MyTaskBarIcon::OnMenuExit(wxCommandEvent& )
 {

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

 
     // Nudge wxWindows into destroying the dialog, since
     // with a hidden window no messages will get sent to put
 
     // Nudge wxWindows into destroying the dialog, since
     // with a hidden window no messages will get sent to put


@@ -154,7 +154,7 @@ void MyTaskBarIcon::OnRButtonUp(wxEvent&)
 
 void MyTaskBarIcon::OnLButtonDClick(wxEvent&)
 {
 
 void MyTaskBarIcon::OnLButtonDClick(wxEvent&)
 {

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

 }
 
 
 }