Changeset 625 in dev for trunk/ab5.0/abdev/abdev/include

Timestamp:

May 27, 2008, 9:17:34 PM (16 years ago)

Author:

dai_9181

Message:

・WindowInfoクラスをリファクタリング
・MdiInfoを単純配列からvectorに変更した。

File:

• trunk/ab5.0/abdev/abdev/include/ProjectManager/WindowManager.h (modified) (5 diffs)

trunk/ab5.0/abdev/abdev/include/ProjectManager/WindowManager.h

@@ -105 +105 @@
 };
 typedef std::vector<ChildWindowInfo *> ChildWindowInfos;
+
+struct WindowType
+{
+    enum EnumType
+    {
+        Default = 0,
+        ModalDlg = 1,
+        ModelessDlg = 3,
+    };
+};
+
 class WindowInfo
     : public WindowInfoBase
 {
 public:
-    WindowInfo()
-        : WindowInfoBase()
-        , CallBackName( NULL )
-    {
+
+    const std::string GetSourceFileName() const
+    {
+        return this->GetName() + ".ab";
     }
 
@@ -124 +135 @@
     }
 
-    const std::string &GetHandleName() const
-    {
-        return handleName;
-    }
-    void SetHandleName( const std::string &handleName )
-    {
-        this->handleName = handleName;
+    const std::string GetHandleName() const
+    {
+        return "h" + this->GetName();
+    }
+
+    const std::string GetCallbackName() const
+    {
+        return this->GetName() + "Proc";
     }
 
@@ -166 +178 @@
     {
         return !iconResourceName.empty();
+    }
+
+    WindowType::EnumType GetType() const
+    {
+        return type;
+    }
+    void SetType( WindowType::EnumType type )
+    {
+        this->type = type;
+    }
+    bool IsDefaultWindow() const
+    {
+        return ( type == WindowType::Default );
+    }
+    bool IsModalDlg() const
+    {
+        return ( type == WindowType::ModalDlg );
+    }
+    bool IsModelessDlg() const
+    {
+        return ( type == WindowType::ModelessDlg );
     }
 
     //ウィンドウデータ
     LOGFONT LogFont;
-    char *CallBackName;
-    long type;
-    char *filepath;
 
     //子ウィンドウ管理
@@ -186 +216 @@
     int backgroundColor;
     std::string iconResourceName;
+    WindowType::EnumType type;
 };
 
@@ -211 +242 @@
     {
         WindowInfos::iterator it = this->begin();
-        for( int i=0; i!=index ;i++, it++ )
+        int i = 0;
+        while( i < index )
         {
-            delete *it;
+            i ++;
+            it ++;
         }
         this->erase( it );