X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/743e24aa72ed41a56884698802e3b31ca9f26b31..1440bc7afaf4df2b1eead69709a8149c847f53de:/include/wx/window.h

diff --git a/include/wx/window.h b/include/wx/window.h
index 7bc9a91787..da86c0b470 100644
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -168,29 +168,11 @@ public:
     // window attributes
     // -----------------
 
-#if !defined(__WXMSW__) && \
-    !defined(__WXMGL__) && \
-    !defined(__WXMOTIF__) && \
-    !defined(__WXPM__) && \
-    !defined(__WXGTK__)
-
-    // FIXME: This is work in progress about moving SetTitle/GetTitle from wxWindow
-    // to wxTopLevelWindow so initially enabled in wxMSW only to observe results
-    // and continue on other platforms
-
-    virtual void SetTitle( const wxString& WXUNUSED(title) ) {}
-    virtual wxString GetTitle() const { return wxEmptyString; }
-
-    // label is just the same as the title (but for, e.g., buttons it
-    // makes more sense to speak about labels)
-    virtual void SetLabel(const wxString& label) { SetTitle(label); }
-    virtual wxString GetLabel() const { return GetTitle(); }
-#else
-    // label is just the same as the title (but for, e.g., buttons it
-    // makes more sense to speak about labels)
+        // label is just the same as the title (but for, e.g., buttons it
+        // makes more sense to speak about labels), title access
+        // is available from wxTLW classes only (frames, dialogs)
     virtual void SetLabel(const wxString& label) = 0;
     virtual wxString GetLabel() const = 0;
-#endif
 
         // the window name is used for ressource setting in X, it is not the
         // same as the window title/label
@@ -974,7 +956,7 @@ public:
     void DeleteRelatedConstraints();
     void ResetConstraints();
 
-        // these methods may be overriden for special layout algorithms
+        // these methods may be overridden for special layout algorithms
     virtual void SetConstraintSizes(bool recurse = true);
     virtual bool LayoutPhase1(int *noChanges);
     virtual bool LayoutPhase2(int *noChanges);