X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/153b7996e59cbc85c6c4016a00dd3e99635a74aa..e74563e412a08aa004c5429efed7ef0031c2c1bf:/include/wx/generic/splitter.h

diff --git a/include/wx/generic/splitter.h b/include/wx/generic/splitter.h
index 3667538fda..8e1b7483e1 100644
--- a/include/wx/generic/splitter.h
+++ b/include/wx/generic/splitter.h
@@ -12,7 +12,7 @@
 #ifndef __SPLITTERH_G__
 #define __SPLITTERH_G__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "splitter.h"
 #endif
 
@@ -71,7 +71,7 @@ public:
                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
                      long style = wxSP_3D,
-                     const wxString& name = "splitter")
+                     const wxString& name = wxT("splitter"))
     {
         Init();
         Create(parent, id, pos, size, style, name);
@@ -83,7 +83,7 @@ public:
                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
                      long style = wxSP_3D,
-                     const wxString& name = "splitter");
+                     const wxString& name = wxT("splitter"));
 
     // Gets the only or left/top pane
     wxWindow *GetWindow1() const { return m_windowOne; }
@@ -244,7 +244,12 @@ protected:
     int ConvertSashPosition(int sashPos) const;
 
     // set the real sash position, sashPos here must be positive
-    void DoSetSashPosition(int sashPos);
+    //
+    // returns TRUE if the sash position has been changed, FALSE otherwise
+    bool DoSetSashPosition(int sashPos);
+
+    // set the sash position and send an event about it having been changed
+    void SetSashPositionAndNotify(int sashPos);
 
     // set the cursor appropriate for the current split mode
     void SetResizeCursor();
@@ -280,6 +285,7 @@ private:
 
     DECLARE_DYNAMIC_CLASS(wxSplitterWindow)
     DECLARE_EVENT_TABLE()
+    DECLARE_NO_COPY_CLASS(wxSplitterWindow)
 };
 
 // ----------------------------------------------------------------------------