(very) small changes for Windows compilation

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@933 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

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

diff --git a/user/wxLayout/wxllist.cpp b/user/wxLayout/wxllist.cpp
index b26995e0b97e65cf92743c776cc9713f4b7e87d6..abba142b089902db86f1591f8981510e73141b99 100644 (file)
--- a/user/wxLayout/wxllist.cpp
+++ b/user/wxLayout/wxllist.cpp
@@ -1144,7 +1144,7 @@ void wxLayoutPrintout::GetPageInfo(int *minPage, int *maxPage, int *selPageFrom,
 {
    // ugly hack to get number of pages
 #ifdef __WXMSW__
-   wxPrinterDC psdc(WXLLIST_TEMPFILE,false);
+   wxPrinterDC psdc("", "", WXLLIST_TEMPFILE,false);
 #else
    wxPostScriptDC psdc(WXLLIST_TEMPFILE,false);
 #endif

diff --git a/user/wxLayout/wxlwindow.cpp b/user/wxLayout/wxlwindow.cpp
index f7f158e334f99545d1d8bdf4f73a33271a6f3a15..828ac67a71fc0d2f76c1e17c0db2b90ec93e210d 100644 (file)
--- a/user/wxLayout/wxlwindow.cpp
+++ b/user/wxLayout/wxlwindow.cpp
@@ -19,6 +19,14 @@
 #   endif // USE_PCH
 #   include "gui/wxlwindow.h"
 #else
+#   ifdef   __WXMSW__
+#       include <windows.h>
+
+#       undef FindWindow
+#       undef GetCharWidth
+#       undef StartDoc
+#   endif
+
 #   include "wxlwindow.h"
 #   define TRACEMESSAGE(x)
 #endif