Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Further improvements to MFC sample.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18295 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-12-17 11:18:09 +00:00
parent 4cd513abbc
commit 2243113487
2 changed files with 134 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
samples/mfc/mfc.dsp
View File

@@ -24,115 +24,116 @@ CFG=mfc - Win32 Debug
!MESSAGE !MESSAGE
# Begin Project # Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName "" # PROP Scc_ProjName ""
# PROP Scc_LocalPath "" # PROP Scc_LocalPath ""
CPP=cl.exe CPP=cl.exe
MTL=midl.exe MTL=midl.exe
RSC=rc.exe RSC=rc.exe
!ELSEIF "$(CFG)" == "mfc - Win32 Release DLL" !IF "$(CFG)" == "mfc - Win32 Release DLL"
# PROP BASE Use_MFC 0 # PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0 # PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "ReleaseDll" # PROP BASE Output_Dir "ReleaseDll"
# PROP BASE Intermediate_Dir "ReleaseDll" # PROP BASE Intermediate_Dir "ReleaseDll"
# PROP BASE Target_Dir "" # PROP BASE Target_Dir ""
# PROP Use_MFC 0 # PROP Use_MFC 2
# PROP Use_Debug_Libraries 0 # PROP Use_Debug_Libraries 0
# PROP Output_Dir "ReleaseDll" # PROP Output_Dir "ReleaseDll"
# PROP Intermediate_Dir "ReleaseDll" # PROP Intermediate_Dir "ReleaseDll"
# PROP Ignore_Export_Lib 0 # PROP Ignore_Export_Lib 0
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /W4 /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /YX /FD /c # ADD BASE CPP /nologo /W4 /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /YX /FD /c
# ADD CPP /nologo /W4 /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /D WIN32 /D WINVER=0x400 /D _MT /D wxUSE_GUI=1 /YX /FD /c /MD /D WXUSINGDLL /I..\..\lib\mswdll # ADD CPP /nologo /MD /W4 /GX /O2 /I "..\..\include" /I "..\..\lib\mswdll" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /D "_MT" /D wxUSE_GUI=1 /D "WXUSINGDLL" /D "_AFXDLL" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG" /I "..\..\include" # ADD BASE RSC /l 0x409 /i "..\..\include" /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG" /I "..\..\include" # ADD RSC /l 0x409 /i "..\..\include" /d "NDEBUG" /d "_AFXDLL"
BSC32=bscmake.exe BSC32=bscmake.exe
# ADD BASE BSC32 /nologo # ADD BASE BSC32 /nologo
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=link.exe LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw250.lib # ADD LINK32 comctl32.lib rpcrt4.lib wsock32.lib ..\..\lib\wxmsw250.lib /nologo /subsystem:windows /machine:I386
!ELSEIF "$(CFG)" == "mfc - Win32 Debug DLL" !ELSEIF "$(CFG)" == "mfc - Win32 Debug DLL"
# PROP BASE Use_MFC 0 # PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1 # PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "DebugDll" # PROP BASE Output_Dir "DebugDll"
# PROP BASE Intermediate_Dir "DebugDll" # PROP BASE Intermediate_Dir "DebugDll"
# PROP BASE Target_Dir "" # PROP BASE Target_Dir ""
# PROP Use_MFC 0 # PROP Use_MFC 2
# PROP Use_Debug_Libraries 1 # PROP Use_Debug_Libraries 1
# PROP Output_Dir "DebugDll" # PROP Output_Dir "DebugDll"
# PROP Intermediate_Dir "DebugDll" # PROP Intermediate_Dir "DebugDll"
# PROP Ignore_Export_Lib 0 # PROP Ignore_Export_Lib 0
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /W4 /Zi /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /YX /FD /c # ADD BASE CPP /nologo /W4 /Zi /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /YX /FD /c
# ADD CPP /nologo /W4 /Zi /Od /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /D WIN32 /D WINVER=0x400 /D _MT /D wxUSE_GUI=1 /YX /FD /c /MDd /D "__WXDEBUG__" /D "WXDEBUG=1" /D WXUSINGDLL /I..\..\lib\mswdlld # ADD CPP /nologo /MDd /W4 /GX /Zi /Od /I "..\..\include" /I "..\..\lib\mswdlld" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /D "_MT" /D wxUSE_GUI=1 /D "__WXDEBUG__" /D WXDEBUG=1 /D "WXUSINGDLL" /D "_AFXDLL" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG" /I "..\..\include" # ADD BASE RSC /l 0x409 /i "..\..\include" /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG" /I "..\..\include" # ADD RSC /l 0x409 /i "..\..\include" /d "_DEBUG" /d "_AFXDLL"
BSC32=bscmake.exe BSC32=bscmake.exe
# ADD BASE BSC32 /nologo # ADD BASE BSC32 /nologo
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=link.exe LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw250d.lib # ADD LINK32 comctl32.lib rpcrt4.lib wsock32.lib ..\..\lib\wxmsw250d.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
!ELSEIF "$(CFG)" == "mfc - Win32 Release" !ELSEIF "$(CFG)" == "mfc - Win32 Release"
# PROP BASE Use_MFC 0 # PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0 # PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release" # PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release" # PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir "" # PROP BASE Target_Dir ""
# PROP Use_MFC 0 # PROP Use_MFC 2
# PROP Use_Debug_Libraries 0 # PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release" # PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release" # PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0 # PROP Ignore_Export_Lib 0
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /W4 /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /YX /FD /c # ADD BASE CPP /nologo /W4 /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /YX /FD /c
# ADD CPP /nologo /W4 /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /D WIN32 /D WINVER=0x400 /D _MT /D wxUSE_GUI=1 /YX /FD /c /MD /I..\..\lib\msw # ADD CPP /nologo /MD /W4 /GX /O2 /I "..\..\include" /I "..\..\lib\msw" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /D "_MT" /D wxUSE_GUI=1 /D "_AFXDLL" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG" /I "..\..\include" # ADD BASE RSC /l 0x409 /i "..\..\include" /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG" /I "..\..\include" # ADD RSC /l 0x409 /i "..\..\include" /d "NDEBUG" /d "_AFXDLL"
BSC32=bscmake.exe BSC32=bscmake.exe
# ADD BASE BSC32 /nologo # ADD BASE BSC32 /nologo
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=link.exe LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386 ..\..\lib\zlib.lib ..\..\lib\regex.lib ..\..\lib\png.lib ..\..\lib\jpeg.lib ..\..\lib\tiff.lib ..\..\lib\wxmsw.lib # ADD LINK32 comctl32.lib rpcrt4.lib wsock32.lib ..\..\lib\zlib.lib ..\..\lib\regex.lib ..\..\lib\png.lib ..\..\lib\jpeg.lib ..\..\lib\tiff.lib ..\..\lib\wxmsw.lib /nologo /subsystem:windows /machine:I386
!ELSEIF "$(CFG)" == "mfc - Win32 Debug" !ELSEIF "$(CFG)" == "mfc - Win32 Debug"
# PROP BASE Use_MFC 0 # PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1 # PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug" # PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug" # PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir "" # PROP BASE Target_Dir ""
# PROP Use_MFC 0 # PROP Use_MFC 2
# PROP Use_Debug_Libraries 1 # PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug" # PROP Output_Dir "Debug"
# PROP Intermediate_Dir "Debug" # PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0 # PROP Ignore_Export_Lib 0
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /W4 /Zi /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /YX /FD /c # ADD BASE CPP /nologo /W4 /Zi /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /YX /FD /c
# ADD CPP /nologo /W4 /Zi /Od /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /D WIN32 /D WINVER=0x400 /D _MT /D wxUSE_GUI=1 /YX /FD /c /MDd /D "__WXDEBUG__" /D "WXDEBUG=1" /I..\..\lib\mswd # ADD CPP /nologo /MDd /W4 /GX /Zi /Od /I "..\..\include" /I "..\..\lib\mswd" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /D "_MT" /D wxUSE_GUI=1 /D "__WXDEBUG__" /D WXDEBUG=1 /D "_AFXDLL" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG" /I "..\..\include" # ADD BASE RSC /l 0x409 /i "..\..\include" /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG" /I "..\..\include" # ADD RSC /l 0x409 /i "..\..\include" /d "_DEBUG" /d "_AFXDLL"
BSC32=bscmake.exe BSC32=bscmake.exe
# ADD BASE BSC32 /nologo # ADD BASE BSC32 /nologo
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=link.exe LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\zlibd.lib ..\..\lib\regexd.lib ..\..\lib\pngd.lib ..\..\lib\jpegd.lib ..\..\lib\tiffd.lib ..\..\lib\wxmswd.lib # ADD LINK32 comctl32.lib rpcrt4.lib wsock32.lib ..\..\lib\zlibd.lib ..\..\lib\regexd.lib ..\..\lib\pngd.lib ..\..\lib\jpegd.lib ..\..\lib\tiffd.lib ..\..\lib\wxmswd.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
!ENDIF !ENDIF

198
samples/mfc/mfctest.cpp
View File

@@ -24,30 +24,31 @@
// //
// You can easily modify this code so that an MFC window pops up // You can easily modify this code so that an MFC window pops up
// initially as the main frame, and allows wxWindows frames to be // initially as the main frame, and allows wxWindows frames to be
// created subsequently: // created subsequently.
// //
// (1) Make MyApp::OnInit return FALSE, not creating a window. // (1) Make MyApp::OnInit not create a main window.
// (2) Restore the MFC code to create a window in InitInstance, and remove // (2) Make MFC's InitInstance create a main window, and remove
// creation of CDummyWindow. // creation of CDummyWindow.
//
// This can be accomplished by setting START_WITH_MFC_WINDOW to 1 below.
#define START_WITH_MFC_WINDOW 0
// //
// IMPORTANT NOTES: // IMPORTANT NOTES:
// //
// (1) You need to set wxUSE_MFC to 1 in include/wx/msw/setup.h, which switches // (1) You need to set wxUSE_MFC to 1 in include/wx/msw/setup.h, which switches
// off some debugging features and also removes the windows.h inclusion // off some debugging features and also removes the windows.h inclusion
// in wxprec.h (MFC headers don't like this to have been included previously). // in wxprec.h (MFC headers don't like this to have been included previously).
// Set to 'Use MFC in a shared DLL' or add _AFXDLL to preprocessor settings.
// Then recompile wxWindows and this sample. // Then recompile wxWindows and this sample.
// //
// (2) 10/3/2000, wxWindows 2.1.14: unfortunately there is an assert when // (2) I can't get the sample to link and run using a static MFC library, only the DLL
// the sample tries to create an MFC window. Any suggestions welcome. It may be
// a problem with conflicting project settings. Ignoring the assert (several times)
// allows the sample to continue. In release mode the asserts don't happen.
//
// (3) I can't get the sample to link using a static MFC library, only the DLL
// version. Perhaps someone else is a wizard at working out the required settings // version. Perhaps someone else is a wizard at working out the required settings
// in the wxWin library and the sample; then debugging the assert problem may be // in the wxWin library and the sample; then debugging the assert problem may be
// easier. // easier.
// //
// (4) Compiling wxWindows in DLL mode currently includes windows.h, so you must only // (3) Compiling wxWindows in DLL mode currently includes windows.h, so you must only
// try linking wxWindows statically. // try linking wxWindows statically.
// For compilers that support precompilation, includes "wx/wx.h". // For compilers that support precompilation, includes "wx/wx.h".
@@ -89,31 +90,31 @@ CTheApp theApp;
// Define a new application type // Define a new application type
class MyApp: public wxApp class MyApp: public wxApp
{ public: { public:
bool OnInit(void); bool OnInit(void);
wxFrame *CreateFrame(void); wxFrame *CreateFrame(void);
}; };
class MyCanvas: public wxScrolledWindow class MyCanvas: public wxScrolledWindow
{ {
public: public:
MyCanvas(wxWindow *parent, const wxPoint& pos, const wxSize& size); MyCanvas(wxWindow *parent, const wxPoint& pos, const wxSize& size);
void OnPaint(wxPaintEvent& event); void OnPaint(wxPaintEvent& event);
void OnMouseEvent(wxMouseEvent& event); void OnMouseEvent(wxMouseEvent& event);
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };
class MyChild: public wxFrame class MyChild: public wxFrame
{ {
public: public:
MyCanvas *canvas; MyCanvas *canvas;
MyChild(wxFrame *frame, const wxString& title, const wxPoint& pos, const wxSize& size, const long style); MyChild(wxFrame *frame, const wxString& title, const wxPoint& pos, const wxSize& size, const long style);
~MyChild(void); ~MyChild(void);
void OnQuit(wxCommandEvent& event); void OnQuit(wxCommandEvent& event);
void OnNew(wxCommandEvent& event); void OnNew(wxCommandEvent& event);
void OnActivate(wxActivateEvent& event); void OnActivate(wxActivateEvent& event);
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };
// For drawing lines in a canvas // For drawing lines in a canvas
@@ -151,13 +152,13 @@ void CMainWindow::OnPaint()
CString s = "Hello, Windows!"; CString s = "Hello, Windows!";
CPaintDC dc( this ); CPaintDC dc( this );
CRect rect; CRect rect;
GetClientRect( rect ); GetClientRect( rect );
dc.SetTextAlign( TA_BASELINE | TA_CENTER ); dc.SetTextAlign( TA_BASELINE | TA_CENTER );
dc.SetTextColor( ::GetSysColor( COLOR_WINDOWTEXT ) ); dc.SetTextColor( ::GetSysColor( COLOR_WINDOWTEXT ) );
dc.SetBkMode(TRANSPARENT); dc.SetBkMode(TRANSPARENT);
dc.TextOut( ( rect.right / 2 ), ( rect.bottom / 2 ), dc.TextOut( ( rect.right / 2 ), ( rect.bottom / 2 ),
s, s.GetLength() ); s, s.GetLength() );
} }
// OnAbout: // OnAbout:
@@ -176,8 +177,8 @@ void CMainWindow::OnAbout()
void CMainWindow::OnTest() void CMainWindow::OnTest()
{ {
wxMessageBox("This is a wxWindows message box.\nWe're about to create a new wxWindows frame.", "wxWindows", wxOK); wxMessageBox("This is a wxWindows message box.\nWe're about to create a new wxWindows frame.", "wxWindows", wxOK);
wxGetApp().CreateFrame(); wxGetApp().CreateFrame();
} }
// CMainWindow message map: // CMainWindow message map:
@@ -190,11 +191,11 @@ void CMainWindow::OnTest()
// receive no arguments and are void of return type, e.g., "void OnAbout()". // receive no arguments and are void of return type, e.g., "void OnAbout()".
// //
BEGIN_MESSAGE_MAP( CMainWindow, CFrameWnd ) BEGIN_MESSAGE_MAP( CMainWindow, CFrameWnd )
//{{AFX_MSG_MAP( CMainWindow ) //{{AFX_MSG_MAP( CMainWindow )
ON_WM_PAINT() ON_WM_PAINT()
ON_COMMAND( IDM_ABOUT, OnAbout ) ON_COMMAND( IDM_ABOUT, OnAbout )
ON_COMMAND( IDM_TEST, OnTest ) ON_COMMAND( IDM_TEST, OnTest )
//}}AFX_MSG_MAP //}}AFX_MSG_MAP
END_MESSAGE_MAP() END_MESSAGE_MAP()
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
@@ -209,33 +210,35 @@ END_MESSAGE_MAP()
// //
BOOL CTheApp::InitInstance() BOOL CTheApp::InitInstance()
{ {
TRACE( "HELLO WORLD\n" );
SetDialogBkColor(); // hook gray dialogs (was default in MFC V1) SetDialogBkColor(); // hook gray dialogs (was default in MFC V1)
wxEntry((WXHINSTANCE) m_hInstance, (WXHINSTANCE) m_hPrevInstance, m_lpCmdLine, m_nCmdShow, FALSE); wxEntry((WXHINSTANCE) m_hInstance, (WXHINSTANCE) m_hPrevInstance, m_lpCmdLine, m_nCmdShow, FALSE);
/* #if START_WITH_MFC_WINDOW
// Demonstrate creation of an initial MFC main window.
m_pMainWnd = new CMainWindow(); m_pMainWnd = new CMainWindow();
m_pMainWnd->ShowWindow( m_nCmdShow ); m_pMainWnd->ShowWindow( m_nCmdShow );
m_pMainWnd->UpdateWindow(); m_pMainWnd->UpdateWindow();
*/ #else
// Demonstrate creation of an initial wxWindows main window.
// Wrap wxWindows window in a dummy MFC window and
// make the main window.
if (wxTheApp && wxTheApp->GetTopWindow()) if (wxTheApp && wxTheApp->GetTopWindow())
{ {
m_pMainWnd = new CDummyWindow((HWND) wxTheApp->GetTopWindow()->GetHWND()); m_pMainWnd = new CDummyWindow((HWND) wxTheApp->GetTopWindow()->GetHWND());
} }
#endif
return TRUE; return TRUE;
} }
int CTheApp::ExitInstance() int CTheApp::ExitInstance()
{ {
// OnExit isn't called by CleanUp so must be called explicitly. // OnExit isn't called by CleanUp so must be called explicitly.
wxTheApp->OnExit(); wxTheApp->OnExit();
wxApp::CleanUp(); wxApp::CleanUp();
return CWinApp::ExitInstance(); return CWinApp::ExitInstance();
} }
// Override this to provide wxWindows message loop // Override this to provide wxWindows message loop
@@ -243,10 +246,10 @@ int CTheApp::ExitInstance()
BOOL CTheApp::PreTranslateMessage(MSG *msg) BOOL CTheApp::PreTranslateMessage(MSG *msg)
{ {
if (wxTheApp && wxTheApp->ProcessMessage((WXMSG*) msg)) if (wxTheApp && wxTheApp->ProcessMessage((WXMSG*) msg))
return TRUE; return TRUE;
else else
return CWinApp::PreTranslateMessage(msg); return CWinApp::PreTranslateMessage(msg);
} }
BOOL CTheApp::OnIdle(LONG lCount) BOOL CTheApp::OnIdle(LONG lCount)
@@ -258,54 +261,55 @@ BOOL CTheApp::OnIdle(LONG lCount)
} }
/********************************************************************* /*********************************************************************
* wxWindows elements * wxWindows elements
********************************************************************/ ********************************************************************/
bool MyApp::OnInit(void) bool MyApp::OnInit(void)
{ {
// Don't exit app when the top level frame is deleted #if !START_WITH_MFC_WINDOW
SetExitOnFrameDelete(TRUE);
// Exit app when the top level frame is deleted
wxFrame* frame = CreateFrame(); SetExitOnFrameDelete(TRUE);
return TRUE;
(void) CreateFrame();
#endif
return TRUE;
} }
wxFrame *MyApp::CreateFrame(void) wxFrame *MyApp::CreateFrame(void)
{ {
MyChild *subframe = new MyChild(NULL, "Canvas Frame", wxPoint(10, 10), wxSize(300, 300), MyChild *subframe = new MyChild(NULL, "Canvas Frame", wxPoint(10, 10), wxSize(300, 300),
wxDEFAULT_FRAME_STYLE); wxDEFAULT_FRAME_STYLE);
subframe->SetTitle("wxWindows canvas frame");
// Give it a status line
subframe->CreateStatusBar();
// Make a menubar
wxMenu *file_menu = new wxMenu;
file_menu->Append(HELLO_NEW, "&New MFC Window");
file_menu->Append(HELLO_QUIT, "&Close");
wxMenuBar *menu_bar = new wxMenuBar;
menu_bar->Append(file_menu, "&File");
// Associate the menu bar with the frame
subframe->SetMenuBar(menu_bar);
int width, height;
subframe->GetClientSize(&width, &height);
MyCanvas *canvas = new MyCanvas(subframe, wxPoint(0, 0), wxSize(width, height));
canvas->SetCursor(wxCursor(wxCURSOR_PENCIL));
subframe->canvas = canvas;
subframe->Show(TRUE);
subframe->SetTitle("wxWindows canvas frame"); // Return the main frame window
return subframe;
// Give it a status line
subframe->CreateStatusBar();
// Make a menubar
wxMenu *file_menu = new wxMenu;
file_menu->Append(HELLO_NEW, "&New MFC Window");
file_menu->Append(HELLO_QUIT, "&Close");
wxMenuBar *menu_bar = new wxMenuBar;
menu_bar->Append(file_menu, "&File");
// Associate the menu bar with the frame
subframe->SetMenuBar(menu_bar);
int width, height;
subframe->GetClientSize(&width, &height);
MyCanvas *canvas = new MyCanvas(subframe, wxPoint(0, 0), wxSize(width, height));
canvas->SetCursor(wxCursor(wxCURSOR_PENCIL));
subframe->canvas = canvas;
// Give it scrollbars
// canvas->SetScrollbars(20, 20, 50, 50, 4, 4);
subframe->Show(TRUE);
// Return the main frame window
return subframe;
} }
BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow) BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
@@ -315,7 +319,7 @@ END_EVENT_TABLE()
// Define a constructor for my canvas // Define a constructor for my canvas
MyCanvas::MyCanvas(wxWindow *parent, const wxPoint& pos, const wxSize& size): MyCanvas::MyCanvas(wxWindow *parent, const wxPoint& pos, const wxSize& size):
wxScrolledWindow(parent, -1, pos, size) wxScrolledWindow(parent, -1, pos, size)
{ {
} }
@@ -323,17 +327,17 @@ MyCanvas::MyCanvas(wxWindow *parent, const wxPoint& pos, const wxSize& size):
void MyCanvas::OnPaint(wxPaintEvent& event) void MyCanvas::OnPaint(wxPaintEvent& event)
{ {
wxPaintDC dc(this); wxPaintDC dc(this);
dc.SetFont(* wxSWISS_FONT); dc.SetFont(* wxSWISS_FONT);
dc.SetPen(* wxGREEN_PEN); dc.SetPen(* wxGREEN_PEN);
dc.DrawLine(0, 0, 200, 200); dc.DrawLine(0, 0, 200, 200);
dc.DrawLine(200, 0, 0, 200); dc.DrawLine(200, 0, 0, 200);
dc.SetBrush(* wxCYAN_BRUSH); dc.SetBrush(* wxCYAN_BRUSH);
dc.SetPen(* wxRED_PEN); dc.SetPen(* wxRED_PEN);
dc.DrawRectangle(100, 100, 100, 50); dc.DrawRectangle(100, 100, 100, 50);
dc.DrawRoundedRectangle(150, 150, 100, 50, 20); dc.DrawRoundedRectangle(150, 150, 100, 50, 20);
dc.DrawEllipse(250, 250, 100, 50); dc.DrawEllipse(250, 250, 100, 50);
dc.DrawSpline(50, 200, 50, 100, 200, 10); dc.DrawSpline(50, 200, 50, 100, 200, 10);
dc.DrawLine(50, 230, 200, 230); dc.DrawLine(50, 230, 200, 230);
@@ -362,9 +366,9 @@ BEGIN_EVENT_TABLE(MyChild, wxFrame)
END_EVENT_TABLE() END_EVENT_TABLE()
MyChild::MyChild(wxFrame *frame, const wxString& title, const wxPoint& pos, const wxSize& size, const long style): MyChild::MyChild(wxFrame *frame, const wxString& title, const wxPoint& pos, const wxSize& size, const long style):
wxFrame(frame, -1, title, pos, size, style) wxFrame(frame, -1, title, pos, size, style)
{ {
canvas = NULL; canvas = NULL;
} }
MyChild::~MyChild(void) MyChild::~MyChild(void)
@@ -382,23 +386,23 @@ void MyChild::OnNew(wxCommandEvent& event)
mainWin->ShowWindow( TRUE ); mainWin->ShowWindow( TRUE );
mainWin->UpdateWindow(); mainWin->UpdateWindow();
} }
void MyChild::OnActivate(wxActivateEvent& event) void MyChild::OnActivate(wxActivateEvent& event)
{ {
if (event.GetActive() && canvas) if (event.GetActive() && canvas)
canvas->SetFocus(); canvas->SetFocus();
} }
// Dummy MFC window for specifying a valid main window to MFC, using // Dummy MFC window for specifying a valid main window to MFC, using
// a wxWindows HWND. // a wxWindows HWND.
CDummyWindow::CDummyWindow(HWND hWnd):CWnd() CDummyWindow::CDummyWindow(HWND hWnd):CWnd()
{ {
Attach(hWnd); Attach(hWnd);
} }
// Don't let the CWnd destructor delete the HWND // Don't let the CWnd destructor delete the HWND
CDummyWindow::~CDummyWindow(void) CDummyWindow::~CDummyWindow(void)
{ {
Detach(); Detach();
} }