X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/34097680c05edc672b61dd413022cd8b9ad0294f..d77df9f7d023b026a7bbe995ddd36cfdbe07e3d5:/include/wx/motif/window.h diff --git a/include/wx/motif/window.h b/include/wx/motif/window.h index 819fe17f3e..12760abecb 100644 --- a/include/wx/motif/window.h +++ b/include/wx/motif/window.h @@ -20,8 +20,8 @@ class WXDLLIMPEXP_CORE wxWindow : public wxWindowBase { - friend class WXDLLEXPORT wxDC; - friend class WXDLLEXPORT wxWindowDC; + friend class WXDLLIMPEXP_FWD_CORE wxDC; + friend class WXDLLIMPEXP_FWD_CORE wxWindowDC; public: wxWindow() { Init(); } @@ -73,8 +73,8 @@ public: virtual int GetCharWidth() const; virtual void GetTextExtent(const wxString& string, int *x, int *y, - int *descent = (int *) NULL, - int *externalLeading = (int *) NULL, + int *descent = NULL, + int *externalLeading = NULL, const wxFont *theFont = (const wxFont *) NULL) const; @@ -85,7 +85,7 @@ public: virtual int GetScrollThumb( int orient ) const; virtual int GetScrollRange( int orient ) const; virtual void ScrollWindow( int dx, int dy, - const wxRect* rect = (wxRect *) NULL ); + const wxRect* rect = NULL ); #if wxUSE_DRAG_AND_DROP virtual void SetDropTarget( wxDropTarget *dropTarget ); @@ -147,6 +147,12 @@ public: // Process idle (send update events) void OnInternalIdle(); + // post-creation activities + void PostCreation(); + + // pre-creation activities + void PreCreation(); + protected: // Responds to colour changes: passes event on to children. void OnSysColourChanged(wxSysColourChangedEvent& event); @@ -313,7 +319,7 @@ private: // from scope. // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxNoOptimize +class WXDLLIMPEXP_CORE wxNoOptimize { public: wxNoOptimize() { ms_count++; }