X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dca0f651782d5c2659203c97b3243f613966998d..09b895cb4a954494063eb17d3dc302a654fd99e5:/include/wx/msw/window.h diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h index 159c88b01d..81f2072fad 100644 --- a/include/wx/msw/window.h +++ b/include/wx/msw/window.h @@ -21,7 +21,7 @@ // wxWindow declaration for MSW // --------------------------------------------------------------------------- -class WXDLLEXPORT wxWindowMSW : public wxWindowBase +class WXDLLIMPEXP_CORE wxWindowMSW : public wxWindowBase { friend class wxSpinCtrl; friend class wxSlider; @@ -61,16 +61,14 @@ public: virtual bool Show(bool show = true); virtual bool ShowWithEffect(wxShowEffect effect, - unsigned timeout = 0, - wxDirection dir = wxBOTTOM) + unsigned timeout = 0) { - return MSWShowWithEffect(true, effect, timeout, dir); + return MSWShowWithEffect(true, effect, timeout); } virtual bool HideWithEffect(wxShowEffect effect, - unsigned timeout = 0, - wxDirection dir = wxBOTTOM) + unsigned timeout = 0) { - return MSWShowWithEffect(false, effect, timeout, dir); + return MSWShowWithEffect(false, effect, timeout); } virtual void SetFocus(); @@ -431,8 +429,7 @@ public: // common part of Show/HideWithEffect() bool MSWShowWithEffect(bool show, wxShowEffect effect, - unsigned timeout, - wxDirection dir); + unsigned timeout); // Responds to colour changes: passes event on to children. void OnSysColourChanged(wxSysColourChangedEvent& event); @@ -584,8 +581,8 @@ private: // --------------------------------------------------------------------------- // kbd code translation -WXDLLEXPORT int wxCharCodeMSWToWX(int keySym, WXLPARAM lParam = 0); -WXDLLEXPORT WXWORD wxCharCodeWXToMSW(int id, bool *IsVirtual = NULL); +WXDLLIMPEXP_CORE int wxCharCodeMSWToWX(int keySym, WXLPARAM lParam = 0); +WXDLLIMPEXP_CORE WXWORD wxCharCodeWXToMSW(int id, bool *IsVirtual = NULL); // window creation helper class: before creating a new HWND, instantiate an // object of this class on stack - this allows to process the messages sent to