X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/34097680c05edc672b61dd413022cd8b9ad0294f..7d3f6b4ded6aa412cb1cc306fef478955d448c5b:/include/wx/motif/window.h diff --git a/include/wx/motif/window.h b/include/wx/motif/window.h index 819fe17f3e..82c1793220 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(); } @@ -71,12 +71,6 @@ public: virtual int GetCharHeight() const; virtual int GetCharWidth() const; - virtual void GetTextExtent(const wxString& string, - int *x, int *y, - int *descent = (int *) NULL, - int *externalLeading = (int *) NULL, - const wxFont *theFont = (const wxFont *) NULL) - const; virtual void SetScrollbar( int orient, int pos, int thumbVisible, int range, bool refresh = true ); @@ -85,7 +79,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 ); @@ -144,8 +138,11 @@ public: void ClearUpdateRegion() { m_updateRegion.Clear(); } void SetUpdateRegion(const wxRegion& region) { m_updateRegion = region; } - // 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. @@ -274,6 +271,11 @@ protected: int m_scrollPosY; // implement the base class pure virtuals + virtual void DoGetTextExtent(const wxString& string, + int *x, int *y, + int *descent = NULL, + int *externalLeading = NULL, + const wxFont *font = NULL) const; virtual void DoClientToScreen( int *x, int *y ) const; virtual void DoScreenToClient( int *x, int *y ) const; virtual void DoGetPosition( int *x, int *y ) const; @@ -297,7 +299,7 @@ private: void Init(); DECLARE_DYNAMIC_CLASS(wxWindow) - DECLARE_NO_COPY_CLASS(wxWindow) + wxDECLARE_NO_COPY_CLASS(wxWindow); DECLARE_EVENT_TABLE() }; @@ -313,7 +315,7 @@ private: // from scope. // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxNoOptimize +class WXDLLIMPEXP_CORE wxNoOptimize { public: wxNoOptimize() { ms_count++; }