avoiding crash for pure modifier events

[wxWidgets.git] / include / wx / motif / textctrl.h

diff --git a/include/wx/motif/textctrl.h b/include/wx/motif/textctrl.h
index 22b8f50eebc7985b7137ad0f26fb497dfe9a92e1..e391854724598cf305b6602730d39005b58c6f14 100644 (file)
--- a/include/wx/motif/textctrl.h
+++ b/include/wx/motif/textctrl.h
@@ -13,32 +13,31 @@
 #define _WX_TEXTCTRL_H_
 
 // Single-line text item
 #define _WX_TEXTCTRL_H_
 
 // Single-line text item

-class WXDLLEXPORT wxTextCtrl : public wxTextCtrlBase
+class WXDLLIMPEXP_CORE wxTextCtrl : public wxTextCtrlBase

 {
 {

-    DECLARE_DYNAMIC_CLASS(wxTextCtrl)
-

 public:
     // creation
     // --------
 public:
     // creation
     // --------

+

     wxTextCtrl();
     wxTextCtrl(wxWindow *parent,
     wxTextCtrl();
     wxTextCtrl(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)
+               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)

     {
         Create(parent, id, value, pos, size, style, validator, name);
     }
 
     bool Create(wxWindow *parent, wxWindowID id,
     {
         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);
+                const wxString& value = wxEmptyString,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize, long style = 0,
+                const wxValidator& validator = wxDefaultValidator,
+                const wxString& name = wxTextCtrlNameStr);

 
     // accessors
     // ---------
 
     // accessors
     // ---------


@@ -51,36 +50,6 @@ public:
     // operations
     // ----------
 
     // operations
     // ----------
 

-    // Clipboard operations
-    virtual void Copy();
-    virtual void Cut();
-    virtual void Paste();
-    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 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);
-    virtual void SetEditable(bool editable);
-    // If the return values from and to are the same, there is no
-    // selection.
-    virtual void GetSelection(long* from, long* to) const;
-    virtual bool IsEditable() const ;
-
-    virtual void WriteText(const wxString& text);
-    virtual void AppendText(const wxString& text);

     virtual void MarkDirty();
     virtual void DiscardEdits();
     virtual bool IsModified() const;
     virtual void MarkDirty();
     virtual void DiscardEdits();
     virtual bool IsModified() const;


@@ -88,7 +57,6 @@ public:
     virtual long XYToPosition(long x, long y) const;
     virtual bool PositionToXY(long pos, long *x, long *y) const;
     virtual void ShowPosition(long pos);
     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
     // ---------
 
     // callbacks
     // ---------


@@ -120,15 +88,15 @@ public:
 
     // send the CHAR and TEXT_UPDATED events
     void DoSendEvents(void /* XmTextVerifyCallbackStruct */ *cbs,
 
     // send the CHAR and TEXT_UPDATED events
     void DoSendEvents(void /* XmTextVerifyCallbackStruct */ *cbs,

-        long keycode);
+                      long keycode);

 
 protected:
 
 protected:

-    wxString  m_fileName;
-

     virtual wxSize DoGetBestSize() const;
 
     virtual void DoSetValue(const wxString& value, int flags = 0);
 
     virtual wxSize DoGetBestSize() const;
 
     virtual void DoSetValue(const wxString& value, int flags = 0);
 

+    virtual WXWidget GetTextWidget() const { return m_mainWidget; }
+

 public:
     // Motif-specific
     void*     m_tempCallbackStruct;
 public:
     // Motif-specific
     void*     m_tempCallbackStruct;


@@ -140,6 +108,7 @@ public:
 
 private:
     DECLARE_EVENT_TABLE()
 
 private:
     DECLARE_EVENT_TABLE()

+    DECLARE_DYNAMIC_CLASS(wxTextCtrl)

 };
 
 #endif
 };
 
 #endif