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

(very) small changes for Windows compilation

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@933 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1998-10-28 21:47:16 +00:00
parent 5a43154b56
commit 3ebf240158
3 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
user/wxLayout/wxLayout.cpp
View File

@@ -90,7 +90,10 @@ MyFrame::MyFrame(void) :
wxMenuBar *menu_bar = new wxMenuBar(); wxMenuBar *menu_bar = new wxMenuBar();
menu_bar->Append(file_menu, "File" ); menu_bar->Append(file_menu, "File" );
#ifndef __WXMSW__
menu_bar->Show( TRUE ); menu_bar->Show( TRUE );
#endif // MSW
SetMenuBar( menu_bar ); SetMenuBar( menu_bar );
@@ -112,7 +115,7 @@ MyFrame::AddSampleText(wxLayoutList &llist)
llist.Insert("The quick brown fox jumps over the lazy dog."); llist.Insert("The quick brown fox jumps over the lazy dog.");
llist.LineBreak(); llist.LineBreak();
llist.Insert("Hello "); llist.Insert("Hello ");
llist.Insert(new wxLayoutObjectIcon(new wxIcon(Micon_xpm,-1,-1))); llist.Insert(new wxLayoutObjectIcon(new wxICON(Micon_xpm)));
llist.LineBreak(); llist.LineBreak();
llist.SetFontWeight(wxBOLD); llist.SetFontWeight(wxBOLD);
llist.Insert("World! "); llist.Insert("World! ");

2
user/wxLayout/wxllist.cpp
View File

@@ -1144,7 +1144,7 @@ void wxLayoutPrintout::GetPageInfo(int *minPage, int *maxPage, int *selPageFrom,
{ {
// ugly hack to get number of pages // ugly hack to get number of pages
#ifdef __WXMSW__ #ifdef __WXMSW__
wxPrinterDC psdc(WXLLIST_TEMPFILE,false); wxPrinterDC psdc("", "", WXLLIST_TEMPFILE,false);
#else #else
wxPostScriptDC psdc(WXLLIST_TEMPFILE,false); wxPostScriptDC psdc(WXLLIST_TEMPFILE,false);
#endif #endif

8
user/wxLayout/wxlwindow.cpp
View File

@@ -19,6 +19,14 @@
# endif // USE_PCH # endif // USE_PCH
# include "gui/wxlwindow.h" # include "gui/wxlwindow.h"
#else #else
# ifdef __WXMSW__
# include <windows.h>
# undef FindWindow
# undef GetCharWidth
# undef StartDoc
# endif
# include "wxlwindow.h" # include "wxlwindow.h"
# define TRACEMESSAGE(x) # define TRACEMESSAGE(x)
#endif #endif