Bunch of GTK theme changes.

[wxWidgets.git] / src / motif / textctrl.cpp

diff --git a/src/motif/textctrl.cpp b/src/motif/textctrl.cpp
index 623de21836100e92c0893282d1a372baeba56464..fe72b88437e85d413dfc78b1c84ada12432144cd 100644 (file)
--- a/src/motif/textctrl.cpp
+++ b/src/motif/textctrl.cpp
@@ -21,6 +21,10 @@
     #pragma implementation "textctrl.h"
 #endif
 
     #pragma implementation "textctrl.h"
 #endif
 

+#ifdef __VMS
+#define XtParent XTPARENT
+#endif
+

 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fstream.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fstream.h>


@@ -31,7 +35,13 @@
 #include "wx/filefn.h"
 #include "wx/utils.h"
 
 #include "wx/filefn.h"
 #include "wx/utils.h"
 

+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif

 #include <Xm/Text.h>
 #include <Xm/Text.h>

+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif

 
 #include "wx/motif/private.h"
 
 
 #include "wx/motif/private.h"
 


@@ -51,7 +61,6 @@ static void wxTextWindowGainFocusProc(Widget w, XtPointer clientData, XmAnyCallb
 static void wxTextWindowLoseFocusProc(Widget w, XtPointer clientData, XmAnyCallbackStruct *cbs);
 static void wxTextWindowActivateProc(Widget w, XtPointer clientData, XmAnyCallbackStruct *ptr);
 
 static void wxTextWindowLoseFocusProc(Widget w, XtPointer clientData, XmAnyCallbackStruct *cbs);
 static void wxTextWindowActivateProc(Widget w, XtPointer clientData, XmAnyCallbackStruct *ptr);
 

-#if !USE_SHARED_LIBRARY

     IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxControl)
 
     BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
     IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxControl)
 
     BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)


@@ -71,7 +80,6 @@ static void wxTextWindowActivateProc(Widget w, XtPointer clientData, XmAnyCallba
     EVT_UPDATE_UI(wxID_REDO, wxTextCtrl::OnUpdateRedo)
 
     END_EVENT_TABLE()
     EVT_UPDATE_UI(wxID_REDO, wxTextCtrl::OnUpdateRedo)
 
     END_EVENT_TABLE()

-#endif

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -296,7 +304,7 @@ bool wxTextCtrl::CanCut() const
     // Can cut if there's a selection
     long from, to;
     GetSelection(& from, & to);
     // Can cut if there's a selection
     long from, to;
     GetSelection(& from, & to);

-    return (from != to) ;
+    return (from != to) && (IsEditable());

 }
 
 bool wxTextCtrl::CanPaste() const
 }
 
 bool wxTextCtrl::CanPaste() const


@@ -399,7 +407,7 @@ bool wxTextCtrl::LoadFile(const wxString& file)
     Clear();
 
     Widget textWidget = (Widget) m_mainWidget;
     Clear();
 
     Widget textWidget = (Widget) m_mainWidget;

-    FILE *fp;
+    FILE *fp = 0;

 
     struct stat statb;
     if ((stat ((char*) (const char*) file, &statb) == -1) || (statb.st_mode & S_IFMT) != S_IFREG ||
 
     struct stat statb;
     if ((stat ((char*) (const char*) file, &statb) == -1) || (statb.st_mode & S_IFMT) != S_IFREG ||


@@ -657,7 +665,7 @@ void wxTextCtrl::ChangeBackgroundColour()
             XmNhorizontalScrollBar, &hsb,
             XmNverticalScrollBar, &vsb,
             NULL);
             XmNhorizontalScrollBar, &hsb,
             XmNverticalScrollBar, &vsb,
             NULL);

-        wxColour backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE);
+        wxColour backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);

         if (hsb)
             DoChangeBackgroundColour((WXWidget) hsb, backgroundColour, TRUE);
         if (vsb)
         if (hsb)
             DoChangeBackgroundColour((WXWidget) hsb, backgroundColour, TRUE);
         if (vsb)


@@ -781,7 +789,7 @@ static void MergeChangesIntoString(wxString& value,
 }
 
 static void
 }
 
 static void

-wxTextWindowChangedProc (Widget w, XtPointer clientData, XtPointer ptr)
+wxTextWindowChangedProc (Widget w, XtPointer clientData, XtPointer WXUNUSED(ptr))

 {
     if (!wxGetWindowFromTable(w))
         // Widget has been deleted!
 {
     if (!wxGetWindowFromTable(w))
         // Widget has been deleted!


@@ -792,7 +800,7 @@ wxTextWindowChangedProc (Widget w, XtPointer clientData, XtPointer ptr)
 }
 
 static void
 }
 
 static void

-wxTextWindowModifyProc (Widget w, XtPointer clientData, XmTextVerifyCallbackStruct *cbs)
+wxTextWindowModifyProc (Widget WXUNUSED(w), XtPointer clientData, XmTextVerifyCallbackStruct *cbs)

 {
     wxTextCtrl *tw = (wxTextCtrl *) clientData;
     tw->m_processedDefault = FALSE;
 {
     wxTextCtrl *tw = (wxTextCtrl *) clientData;
     tw->m_processedDefault = FALSE;


@@ -842,7 +850,7 @@ wxTextWindowModifyProc (Widget w, XtPointer clientData, XmTextVerifyCallbackStru
 }
 
 static void
 }
 
 static void

-wxTextWindowGainFocusProc (Widget w, XtPointer clientData, XmAnyCallbackStruct *cbs)
+wxTextWindowGainFocusProc (Widget w, XtPointer clientData, XmAnyCallbackStruct *WXUNUSED(cbs))

 {
     if (!wxGetWindowFromTable(w))
         return;
 {
     if (!wxGetWindowFromTable(w))
         return;


@@ -854,7 +862,7 @@ wxTextWindowGainFocusProc (Widget w, XtPointer clientData, XmAnyCallbackStruct *
 }
 
 static void
 }
 
 static void

-wxTextWindowLoseFocusProc (Widget w, XtPointer clientData, XmAnyCallbackStruct *cbs)
+wxTextWindowLoseFocusProc (Widget w, XtPointer clientData, XmAnyCallbackStruct *WXUNUSED(cbs))

 {
     if (!wxGetWindowFromTable(w))
         return;
 {
     if (!wxGetWindowFromTable(w))
         return;


@@ -866,7 +874,7 @@ wxTextWindowLoseFocusProc (Widget w, XtPointer clientData, XmAnyCallbackStruct *
 }
 
 static void wxTextWindowActivateProc(Widget w, XtPointer clientData,
 }
 
 static void wxTextWindowActivateProc(Widget w, XtPointer clientData,

-                                     XmAnyCallbackStruct *ptr)
+                                     XmAnyCallbackStruct *WXUNUSED(ptr))

 {
     if (!wxGetWindowFromTable(w))
         return;
 {
     if (!wxGetWindowFromTable(w))
         return;