X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cf724bceea97553bef690f52062ffbc336d0f7a9..51d55e1c0cb6d783164f5c8550f424ea3b49c051:/include/wx/msw/treectrl.h diff --git a/include/wx/msw/treectrl.h b/include/wx/msw/treectrl.h index 6f4050df46..b9b401cdbc 100644 --- a/include/wx/msw/treectrl.h +++ b/include/wx/msw/treectrl.h @@ -15,6 +15,7 @@ // ---------------------------------------------------------------------------- // headers // ---------------------------------------------------------------------------- + #ifdef __GNUG__ #pragma interface "treectrl.h" #endif @@ -24,14 +25,10 @@ #include "wx/textctrl.h" #ifdef __GNUWIN32__ -# ifdef GetFirstChild -# undef GetFirstChild -# endif - -# ifdef GetNextSibling -# undef GetNextSibling -# endif -#endif + // Cygwin windows.h defines these identifiers + #undef GetFirstChild + #undef GetNextSibling +#endif // Cygwin // the type for "untyped" data typedef long wxDataType; @@ -447,9 +444,8 @@ public: // implementation // -------------- - void Command(wxCommandEvent& event) { ProcessCommand(event); }; virtual bool MSWCommand(WXUINT param, WXWORD id); - virtual bool MSWNotify(WXWPARAM wParam, WXLPARAM lParam, WXLPARAM *result); + virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result); protected: // SetImageList helper