corrected handling of timeouts in wxConditionInternal::WaitTimeout(): check for wxSEM...

[wxWidgets.git] / include / wx / window.h

diff --git a/include/wx/window.h b/include/wx/window.h
index 29a3b50a86a586aaaee47c4cbf840218a16f90c8..da86c0b4704629a1b3f65e211c11678ffa37ae42 100644 (file)
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -168,24 +168,11 @@ public:
     // window attributes
     // -----------------
 
-#ifndef __WXMSW__
-    // 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
@@ -969,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);