X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83df96d63a52ebb08b9e32549dc255354b4a18d0..26531700c7ec84872c60899ce6219954499086da:/include/wx/motif/textctrl.h

diff --git a/include/wx/motif/textctrl.h b/include/wx/motif/textctrl.h
index 7355c85555..3eaef48ab7 100644
--- a/include/wx/motif/textctrl.h
+++ b/include/wx/motif/textctrl.h
@@ -12,18 +12,15 @@
 #ifndef _WX_TEXTCTRL_H_
 #define _WX_TEXTCTRL_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #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
 {
     DECLARE_DYNAMIC_CLASS(wxTextCtrl)
-        
+
 public:
     // creation
     // --------
@@ -39,26 +36,26 @@ public:
     {
         Create(parent, id, value, pos, size, style, validator, name);
     }
-    
+
     bool Create(wxWindow *parent, wxWindowID id,
         const wxString& value = wxEmptyString,
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize, long style = 0,
         const wxValidator& validator = wxDefaultValidator,
         const wxString& name = wxTextCtrlNameStr);
-    
+
     // accessors
     // ---------
     virtual wxString GetValue() const;
     virtual void SetValue(const wxString& value);
-    
+
     virtual int GetLineLength(long lineNo) const;
     virtual wxString GetLineText(long lineNo) const;
     virtual int GetNumberOfLines() const;
-    
+
     // operations
     // ----------
-    
+
     // Clipboard operations
     virtual void Copy();
     virtual void Cut();
@@ -66,18 +63,18 @@ public:
     virtual bool CanCopy() const;
     virtual bool CanCut() const;
     virtual bool CanPaste() const;
-    
+
     // Undo/redo
     virtual void Undo();
     virtual void Redo();
-    
+
     virtual bool CanUndo() const;
     virtual bool CanRedo() const;
-    
+
     virtual void SetInsertionPoint(long pos);
     virtual void SetInsertionPointEnd();
     virtual long GetInsertionPoint() const;
-    virtual long GetLastPosition() const;
+    virtual wxTextPos GetLastPosition() const;
     virtual void Replace(long from, long to, const wxString& value);
     virtual void Remove(long from, long to);
     virtual void SetSelection(long from, long to);
@@ -86,63 +83,63 @@ public:
     // selection.
     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 MarkDirty();
     virtual void DiscardEdits();
     virtual bool IsModified() const;
-    
+
     virtual long XYToPosition(long x, long y) const;
     virtual bool PositionToXY(long pos, long *x, long *y) const;
     virtual void ShowPosition(long pos);
     virtual void Clear();
-    
+
     // callbacks
     // ---------
     void OnDropFiles(wxDropFilesEvent& event);
     void OnChar(wxKeyEvent& event);
     //  void OnEraseBackground(wxEraseEvent& event);
-    
+
     void OnCut(wxCommandEvent& event);
     void OnCopy(wxCommandEvent& event);
     void OnPaste(wxCommandEvent& event);
     void OnUndo(wxCommandEvent& event);
     void OnRedo(wxCommandEvent& event);
-    
+
     void OnUpdateCut(wxUpdateUIEvent& event);
     void OnUpdateCopy(wxUpdateUIEvent& event);
     void OnUpdatePaste(wxUpdateUIEvent& event);
     void OnUpdateUndo(wxUpdateUIEvent& event);
     void OnUpdateRedo(wxUpdateUIEvent& event);
-    
+
     virtual void Command(wxCommandEvent& event);
-    
+
     // implementation from here to the end
     // -----------------------------------
-    virtual void ChangeFont(bool keepOriginalSize = TRUE);
+    virtual void ChangeFont(bool keepOriginalSize = true);
     virtual void ChangeBackgroundColour();
     virtual void ChangeForegroundColour();
     void SetModified(bool mod) { m_modified = mod; }
     virtual WXWidget GetTopWidget() const;
-    
+
     // send the CHAR and TEXT_UPDATED events
     void DoSendEvents(void /* XmTextVerifyCallbackStruct */ *cbs,
         long keycode);
-    
+
 protected:
     wxString  m_fileName;
-    
+
+    virtual wxSize DoGetBestSize() const;
 public:
     // Motif-specific
     void*     m_tempCallbackStruct;
     bool      m_modified;
     wxString  m_value;            // Required for password text controls
-    
+
     // Did we call wxTextCtrl::OnChar? If so, generate a command event.
     bool      m_processedDefault;
-    
+
 private:
     DECLARE_EVENT_TABLE()
 };