Changeset 124 for cafu/branches/cafu_to_wx/CaWE/GuiEditor/EditorData/Window.hpp

Timestamp:

08/20/10 15:06:58 (21 months ago)

Author:

Carsten

Message:

Merged latest changes from trunk into branches/cafu_to_wx.

Files:

• cafu/branches/cafu_to_wx/CaWE/GuiEditor/EditorData/Window.hpp (modified) (2 diffs)

cafu/branches/cafu_to_wx/CaWE/GuiEditor/EditorData/Window.hpp

@@ -50 +50 @@
 
         /// Checks the name uniqueness of a new name string within the windows siblings.
-        /// @param Name Name to check for uniqueness.
+        /// @param Name    Name to check for uniqueness.
         /// @return Whether this name is unique.
-        bool CheckNameUniqueness(wxString Name);
+        bool CheckNameUniqueness(const wxString& Name) const;
+
+        /// Helper method to check and auto-repair the uniqueness of the name of this window.
+        void RepairNameUniqueness();
 
         GuiDocumentT* GetGuiDoc() { return m_GuiDocument; }
@@ -62 +65 @@
 
         GuiDocumentT* m_GuiDocument;
-
-        /// Helper method to check and repair the uniqueness of the name of this window.
-        void RepairNameUniqueness();
+        unsigned int  m_Counter;
     };
 }