comparison src/main.cpp @ 19:710be7b6a873

arranged FrameCnn's controls.
author pyon@macmini
date Mon, 18 Jul 2011 22:08:04 +0900
parents b67c74848dd0
children 05f76f9f9186
comparison
equal deleted inserted replaced
18:2221c7aa5958 19:710be7b6a873
1 // Filename : main.cpp 1 // Filename : main.cpp
2 // Last Change: 06-Jul-2011. 2 // Last Change: 18-Jul-2011.
3 // 3 //
4 4
5 #include "common.h" 5 #include "common.h"
6 #include "main.h" 6 #include "main.h"
7 #include "myframe.h" 7 #include "myframe.h"
8 #include "preview.h" 8 #include "ccnframe.h"
9 9
10 IMPLEMENT_APP(MyApp) 10 IMPLEMENT_APP(MyApp)
11 11
12 IMPLEMENT_CLASS( MyApp, wxApp ) 12 IMPLEMENT_CLASS( MyApp, wxApp )
13 13
24 24
25 wxImage::AddHandler( new wxJPEGHandler ); 25 wxImage::AddHandler( new wxJPEGHandler );
26 26
27 ConfInit(); 27 ConfInit();
28 28
29 /*
29 MyFrame *mainframe = new MyFrame( NULL, ID_MAIN, wxT("Searcher v2") ); 30 MyFrame *mainframe = new MyFrame( NULL, ID_MAIN, wxT("Searcher v2") );
30 mainframe->SetSize( rect ); 31 mainframe->SetSize( rect );
31 mainframe->Show(true); 32 mainframe->Show(true);
33 */
32 34
33 /* 35 //FrameCcn *a = new FrameCcn( NULL, ID_CCN, wxEmptyString, wxDefaultPosition, wxSize( 512,394 ), wxCAPTION|wxFRAME_NO_TASKBAR|wxTAB_TRAVERSAL );
34 FramePreview *a = new FramePreview( NULL, ID_IMGFRM, wxEmptyString, wxDefaultPosition, wxSize( 512,394 ), wxCAPTION|wxFRAME_NO_TASKBAR|wxMAXIMIZE_BOX|wxRESIZE_BORDER|wxTAB_TRAVERSAL ); 36 FrameCcn *a = new FrameCcn( NULL, ID_CCN, wxEmptyString );
35 a->Show(true); 37 a->Show(true);
36 */
37 38
38 return true; 39 return true;
39 } 40 }
40 41
41 int MyApp::OnExit() 42 int MyApp::OnExit()