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

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

diff --git a/samples/richedit/kbList.h b/samples/richedit/kbList.h
index f69bf25070b8c15b855b5f11f9b0538dd5414d2d..6a1cca93ee468f2f9f48d99c25a4ed669af7141c 100644 (file)
--- a/samples/richedit/kbList.h
+++ b/samples/richedit/kbList.h
@@ -277,7 +277,7 @@ public: \
          /* the cast is needed for MS VC++ 5.0 */ \
          { return (type *)((kbList::iterator *)this)->operator*() ; } \
    }; \
          /* the cast is needed for MS VC++ 5.0 */ \
          { return (type *)((kbList::iterator *)this)->operator*() ; } \
    }; \

-   inline name(bool ownsEntriesFlag = TRUE) \
+   inline name(bool ownsEntriesFlag = true) \

       : kbList(ownsEntriesFlag) {} \
    \
    inline type *pop_back(void) \
       : kbList(ownsEntriesFlag) {} \
    \
    inline type *pop_back(void) \

diff --git a/samples/richedit/wxLayout.cpp b/samples/richedit/wxLayout.cpp
index a7098859651e3444223e2f846b2a0924d0545eec..54530007876726f5bc0eb93196c3c38e95fb62cd 100644 (file)
--- a/samples/richedit/wxLayout.cpp
+++ b/samples/richedit/wxLayout.cpp
@@ -66,8 +66,8 @@ BEGIN_EVENT_TABLE(MyFrame,wxFrame)
    EVT_MENU(ID_PREVIEW_PS, MyFrame::OnPrintPreviewPS)
    EVT_MENU(ID_PRINT_SETUP_PS, MyFrame::OnPrintSetupPS)
    EVT_MENU(ID_PAGE_SETUP_PS, MyFrame::OnPageSetupPS)
    EVT_MENU(ID_PREVIEW_PS, MyFrame::OnPrintPreviewPS)
    EVT_MENU(ID_PRINT_SETUP_PS, MyFrame::OnPrintSetupPS)
    EVT_MENU(ID_PAGE_SETUP_PS, MyFrame::OnPageSetupPS)

-   EVT_MENU    (-1,       MyFrame::OnCommand)
-   EVT_COMMAND (-1,-1,    MyFrame::OnCommand)
+   EVT_MENU    (wxID_ANY,       MyFrame::OnCommand)
+   EVT_COMMAND (wxID_ANY,wxID_ANY,    MyFrame::OnCommand)

    EVT_CHAR    (  wxLayoutWindow::OnChar  )
 END_EVENT_TABLE()
 
    EVT_CHAR    (  wxLayoutWindow::OnChar  )
 END_EVENT_TABLE()
 

diff --git a/samples/richedit/wxlwindow.cpp b/samples/richedit/wxlwindow.cpp
index f191fec414e869a34d383c45fc26c8c60f445590..018e4becaa0d13acff8e54f0e247a58d6aab2213 100644 (file)
--- a/samples/richedit/wxlwindow.cpp
+++ b/samples/richedit/wxlwindow.cpp
@@ -146,7 +146,7 @@ static bool IsDirectionKey(long keyCode);
 // ----------------------------------------------------------------------------
 
 wxLayoutWindow::wxLayoutWindow(wxWindow *parent)
 // ----------------------------------------------------------------------------
 
 wxLayoutWindow::wxLayoutWindow(wxWindow *parent)

-              : wxScrolledWindow(parent, -1,
+              : wxScrolledWindow(parent, wxID_ANY,

                                  wxDefaultPosition, wxDefaultSize,
                                  wxHSCROLL | wxVSCROLL |
                                  wxBORDER |
                                  wxDefaultPosition, wxDefaultSize,
                                  wxHSCROLL | wxVSCROLL |
                                  wxBORDER |