X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9806a47c30050b2beeb772f69d4cef4a20dc8745..b1d66b5415f7befb45e050d7097571642b8bfa56:/include/wx/motif/window.h diff --git a/include/wx/motif/window.h b/include/wx/motif/window.h index 85dbde9f24..e23aeda442 100644 --- a/include/wx/motif/window.h +++ b/include/wx/motif/window.h @@ -24,8 +24,6 @@ class wxWindow : public wxWindowBase { -DECLARE_DYNAMIC_CLASS(wxWindow) - friend class WXDLLEXPORT wxDC; friend class WXDLLEXPORT wxWindowDC; @@ -33,11 +31,11 @@ public: wxWindow() { Init(); } wxWindow(wxWindow *parent, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxPanelNameStr) + wxWindowID id, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = 0, + const wxString& name = wxPanelNameStr) { Init(); Create(parent, id, pos, size, style, name); @@ -171,14 +169,14 @@ public: static void DoChangeForegroundColour(WXWidget widget, wxColour& foregroundColour); static void DoChangeBackgroundColour(WXWidget widget, wxColour& backgroundColour, bool changeArmColour = FALSE); -protected: - // event handlers (not virtual by design) - void OnIdle(wxIdleEvent& event); - // For implementation purposes - sometimes decorations make the client area // smaller virtual wxPoint GetClientAreaOrigin() const; +protected: + // event handlers (not virtual by design) + void OnIdle(wxIdleEvent& event); + // Makes an adjustment to the window position (for example, a frame that has // a toolbar that it manages itself). virtual void AdjustForParentClientOrigin(int& x, int& y, int sizeFlags); @@ -327,7 +325,8 @@ private: // common part of all ctors void Init(); - DECLARE_NO_COPY_CLASS(wxWindow); + DECLARE_DYNAMIC_CLASS(wxWindow) + DECLARE_NO_COPY_CLASS(wxWindow) DECLARE_EVENT_TABLE() };