X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a71d815bbe669ebb9bdb9409926a272c37a5a9aa..0bbe61b8c18a1795189f0cf73cc61c14a0fb846d:/src/msw/tabctrl.cpp diff --git a/src/msw/tabctrl.cpp b/src/msw/tabctrl.cpp index b2a69f6e77..ddb0255c42 100644 --- a/src/msw/tabctrl.cpp +++ b/src/msw/tabctrl.cpp @@ -13,20 +13,20 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif +#if wxUSE_TAB_DIALOG + #ifndef WX_PRECOMP -#include "wx/wx.h" + #include "wx/msw/wrapcctl.h" // include "properly" + #include "wx/wx.h" + #include "wx/app.h" #endif #include "wx/msw/private.h" -// include "properly" -#include "wx/msw/wrapcctl.h" - #include "wx/tabctrl.h" -#include "wx/app.h" #include "wx/msw/imaglist.h" IMPLEMENT_DYNAMIC_CLASS(wxTabCtrl, wxControl) @@ -98,7 +98,7 @@ bool wxTabCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, cons tabStyle, // Styles and defaults. x, y, width, height, // Standard size and position. (HWND) parent->GetHWND(), // Parent window - (HMENU)m_windowId, // ID. + (HMENU)m_windowId.GetValue(), // ID. wxGetInstance(), // Current instance. NULL ); // No class data. @@ -149,7 +149,7 @@ bool wxTabCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) event.SetInt(idCtrl) ; event.SetSelection(idCtrl); - return ProcessEvent(event); + return HandleWindowEvent(event); } // Responds to colour changes, and passes event on to children. @@ -428,3 +428,5 @@ void wxMapBitmap(HBITMAP hBitmap, int width, int height) } #endif + +#endif // wxUSE_TAB_DIALOG