Changeset 625 in dev for trunk/ab5.0/abdev/abdev/Common.h

Timestamp:

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

Author:

dai_9181

Message:

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

File:

• trunk/ab5.0/abdev/abdev/Common.h (modified) (9 diffs)

trunk/ab5.0/abdev/abdev/Common.h

@@ -258 +258 @@
 struct RAD_UNDOSTATE_NAME{
     std::string name;
-    std::string HandleName;
-    char *CallBackName;
 };
 #define RAD_UNDO_INSERTWND  1
@@ -357 +355 @@
     int DocType;
     char *title;
-    char *path;
+    std::string path;
 
     union{
@@ -368 +366 @@
     char *IndentStr;
 };
-extern MDIINFO MdiInfo[MAX_WNDNUM];
+extern std::vector<MDIINFO> MdiInfo;
 
 //RADツールのマウスドラッグ
@@ -483 +481 @@
 #define EVENTTYPE_MMSYS     2
 
-//ウィンドウ タイプ
-#define WNDTYPE_DEFAULT     0
-#define WNDTYPE_MODALDLG    1
-#define WNDTYPE_MODELESSDLG 3
 
 struct NEWPROJECTINFO{
@@ -648 +642 @@
 char *ReadBuffer( const std::string &path );
 char *ReadBuffer_NonErrMsg( const std::string &path );
-_int8 WriteBuffer(const std::string &path,char *buffer,int length, bool isEnableError = true);
+_int8 WriteBuffer(const std::string &path,const char *buffer,int length, bool isEnableError = true);
 _int8 WriteBuffer_NonErrMsg(const std::string &path,char *buffer,int length);
 void GetRelationalPath(char *path,char *dir);
@@ -738 +732 @@
 void SetupWindow(HWND hwnd);
 BOOL SetRunning(HWND hChild);
-BOOL IsNeedCompile(char *FileName,BOOL bDebug);
+BOOL IsNeedCompile( const std::string &filepath, BOOL bDebug );
 std::string GetLastErrorString();
 
@@ -875 +869 @@
 
     void add(char *path);
-    void insert(char *path);
+    void insert(const char *path);
 
     void ResetFileMenu(CSubMenuEx *pobj_SubMenu,BOOL bOwnerDraw);
@@ -969 +963 @@
 
 //WindowControl.cpp
-int GetWndInfoNum(char *name);
-ActiveBasic::PM::WindowInfo *GetWndInfo( char *name );
+int GetWndInfoNum( const std::string &name );
+ActiveBasic::PM::WindowInfo *GetWndInfo( const std::string &name );
 HGLOBAL Rad_GetChildInfoClipboardData(int WndNum,int WndInfoNum);
 void Rad_PasteChildInfoClipboardData(int WndNum,HGLOBAL hGlobal);
 char *PermutationWndPgmTemplate(char *pBuf,const char *pPjName, char *pWndName, char *pHandleName, char *pProcName);
+const std::string PermutationWndPgmTemplate( const std::string &templateFilePath, const std::string &projectName, std::string &windowName, std::string &handleName, std::string &procName );
 void GetItemClassName(char *buffer,int Control);
 void SaveWindowProgram();
@@ -1057 +1052 @@
 
 //MenuProc.cpp
-int GetMenuInfoNum(const char *name);
+int GetMenuInfoNum(const std::string &name);
 void HeapMenuDataFree(MENU_INFO *pMenuInfo,int ItemNum,int *NumberOfFreedItem);
 BOOL CALLBACK DlgProject_MenuID_Input(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam);