X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83df96d63a52ebb08b9e32549dc255354b4a18d0..5180055b697078e8c6ec7db485f1f1bfa3e91abd:/include/wx/motif/textctrl.h diff --git a/include/wx/motif/textctrl.h b/include/wx/motif/textctrl.h index 7355c85555..7e6a733fa3 100644 --- a/include/wx/motif/textctrl.h +++ b/include/wx/motif/textctrl.h @@ -12,13 +12,10 @@ #ifndef _WX_TEXTCTRL_H_ #define _WX_TEXTCTRL_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "textctrl.h" #endif -WXDLLEXPORT_DATA(extern const char*) wxTextCtrlNameStr; -WXDLLEXPORT_DATA(extern const char*) wxEmptyString; - // Single-line text item class WXDLLEXPORT wxTextCtrl : public wxTextCtrlBase { @@ -87,8 +84,6 @@ public: virtual void GetSelection(long* from, long* to) const; virtual bool IsEditable() const ; - virtual bool LoadFile(const wxString& file); - virtual bool SaveFile(const wxString& file); virtual void WriteText(const wxString& text); virtual void AppendText(const wxString& text); virtual void DiscardEdits(); @@ -133,7 +128,8 @@ public: protected: wxString m_fileName; - + + virtual wxSize DoGetBestSize() const; public: // Motif-specific void* m_tempCallbackStruct;