ArrayLP_TPIFILEINFOをwxArrayPtrVoidに変更するなどの微修正。

[tpi/lychee.git] / src / lychee / frm_main.h

diff --git a/src/lychee/frm_main.h b/src/lychee/frm_main.h
index 86d1c47..2072555 100644 (file)
--- a/src/lychee/frm_main.h
+++ b/src/lychee/frm_main.h
@@ -19,23 +19,25 @@
   $Id$\r
 *******************************************************************************/\r
 \r
-#include <wx/cmdline.h>\r
 #include <wx/splitter.h>\r
 \r
 #ifndef H_LOADED_FRM_MAIN\r
 #define H_LOADED_FRM_MAIN\r
 \r
+#include <wx/arrimpl.cpp>\r
+\r
+WX_DECLARE_OBJARRAY(TPI_FILEINFO, ArrayTPI_FILEINFO);\r
+\r
 class MainFrame: public wxFrame {\r
 public:\r
     wxTreeCtrl * tree_ctrl;\r
     myListCtrl * list_ctrl;\r
+    wxSplitterWindow * window_splitter;\r
        ArrayTPI_FILEINFO fileinfo;\r
        TPIHandle tpi;\r
        wxFileName fnArchive;\r
-       wxString szComment;\r
+       TPI_ARCHIVEINFO aiArchive;\r
        myConfig conf;\r
-       wxString szCurrentPath;\r
-       wxCmdLineParser cmdLine;\r
 \r
     // Event handler.\r
     void OnInit(    wxInitDialogEvent&);\r
@@ -67,8 +69,8 @@ public:
 \r
        void OnFilter(wxCommandEvent&);\r
 \r
-       wxULongLong LoadTPI(wxString);\r
-       int ErrorCheck(int);\r
+       bool LoadTPI(const wxString &, wxULongLong_t *);\r
+       int ErrorCheck(int, const wxString & szAPIName = wxT("Command"));\r
 \r
        MainFrame();\r
        ~MainFrame();\r
@@ -77,7 +79,6 @@ protected:
     wxMenuBar * menubar;\r
     wxToolBar * toolbar;\r
     wxStatusBar * statusbar;\r
-    wxSplitterWindow * window_splitter;\r
     wxTextCtrl * tcFilter;\r
     DECLARE_EVENT_TABLE()\r
 };\r