FreeBSD patch to sckaddr.cpp; include more files in manual; misc

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

diff --git a/docs/latex/wx/classes.tex b/docs/latex/wx/classes.tex
index b6952af9c201f241be3b67b50c6d17bb8591c6fd..56b7f3fadc2c6289ea2a935e2f6bb827597d3a50 100644 (file)
--- a/docs/latex/wx/classes.tex
+++ b/docs/latex/wx/classes.tex
@@ -99,7 +99,7 @@ $$\image{14cm;0cm}{wxclass.ps}$$
 \input listbox.tex
 \input listctrl.tex
 \input listevt.tex
 \input listbox.tex
 \input listctrl.tex
 \input listevt.tex

-%\input log.tex
+\input log.tex

 \input mask.tex
 \input mdi.tex
 \input menu.tex
 \input mask.tex
 \input mdi.tex
 \input menu.tex

diff --git a/docs/latex/wx/topics.tex b/docs/latex/wx/topics.tex
index baf92f865b1a402591792702a1a1ab830c21fb35..a10357aaa5e84aed3b6fa2f0546ff9f11eab1e98 100644 (file)
--- a/docs/latex/wx/topics.tex
+++ b/docs/latex/wx/topics.tex
@@ -6,7 +6,7 @@ This chapter contains a selection of topic overviews.
 
 \input tapp.tex
 \input tlog.tex
 
 \input tapp.tex
 \input tlog.tex

-%\input tconfig.tex
+\input tconfig.tex

 \input tbitmap.tex
 \input tdialog.tex
 \input tfont.tex
 \input tbitmap.tex
 \input tdialog.tex
 \input tfont.tex

diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h
index 252b53c7c72ce043a112dca3304ed14e3bfa2558..21952c2721c3c40ca7bf671cb238f15e30f080b8 100644 (file)
--- a/include/wx/msw/window.h
+++ b/include/wx/msw/window.h
@@ -53,7 +53,7 @@ class WXDLLEXPORT wxCursor;
 class WXDLLEXPORT wxColourMap;
 class WXDLLEXPORT wxFont;
 class WXDLLEXPORT wxMenu;
 class WXDLLEXPORT wxColourMap;
 class WXDLLEXPORT wxFont;
 class WXDLLEXPORT wxMenu;

-class WXDLLEXPORT wxRectangle;
+class WXDLLEXPORT wxRect;

 class WXDLLEXPORT wxBitmap;
 class WXDLLEXPORT wxSizer;
 class WXDLLEXPORT wxList;
 class WXDLLEXPORT wxBitmap;
 class WXDLLEXPORT wxSizer;
 class WXDLLEXPORT wxList;


@@ -228,7 +228,7 @@ public:
   virtual bool PopupMenu(wxMenu *menu, int x, int y);
 
   // Send the window a refresh event
   virtual bool PopupMenu(wxMenu *menu, int x, int y);
 
   // Send the window a refresh event

-  virtual void Refresh(bool eraseBack = TRUE, const wxRectangle *rect = NULL);
+  virtual void Refresh(bool eraseBack = TRUE, const wxRect *rect = NULL);

 
 #if WXWIN_COMPATIBILITY
   // Set/get scroll attributes
 
 #if WXWIN_COMPATIBILITY
   // Set/get scroll attributes


@@ -247,7 +247,7 @@ public:
   virtual int GetScrollRange(int orient) const;
   virtual int GetScrollThumb(int orient) const;
 
   virtual int GetScrollRange(int orient) const;
   virtual int GetScrollThumb(int orient) const;
 

-  virtual void ScrollWindow(int dx, int dy, const wxRectangle *rect = NULL);
+  virtual void ScrollWindow(int dx, int dy, const wxRect *rect = NULL);

 
   // Caret manipulation
   virtual void CreateCaret(int w, int h);
 
   // Caret manipulation
   virtual void CreateCaret(int w, int h);


@@ -668,7 +668,7 @@ public:
 
   wxRegion              m_updateRegion;
 /*
 
   wxRegion              m_updateRegion;
 /*

-  wxRectangle           m_updateRect;             // Bounding box for screen damage area
+  wxRect           m_updateRect;             // Bounding box for screen damage area

 #ifdef __WIN32__
   WXHRGN                m_updateRgn;                  // NT allows access to the rectangle list
 #endif
 #ifdef __WIN32__
   WXHRGN                m_updateRgn;                  // NT allows access to the rectangle list
 #endif

diff --git a/include/wx/utils.h b/include/wx/utils.h
index 0f60931085d9ad15e9c3cbd88c48f7b2afaeef36..46cbc9bf85d27f77dfc2a579f632b63c64b07128 100644 (file)
--- a/include/wx/utils.h
+++ b/include/wx/utils.h
@@ -97,9 +97,9 @@ int WXDLLEXPORT wxHexToDec(char *buf);
 void WXDLLEXPORT wxDecToHex(int dec, char *buf);
 
 // Execute another program. Returns 0 if there was an error, a PID otherwise.
 void WXDLLEXPORT wxDecToHex(int dec, char *buf);
 
 // Execute another program. Returns 0 if there was an error, a PID otherwise.

-long WXDLLEXPORT wxExecute(char **argv, bool Async = FALSE,
+long WXDLLEXPORT wxExecute(char **argv, bool sync = FALSE,

                            wxProcess *process = (wxProcess *) NULL);
                            wxProcess *process = (wxProcess *) NULL);

-long WXDLLEXPORT wxExecute(const wxString& command, bool Async = FALSE,
+long WXDLLEXPORT wxExecute(const wxString& command, bool sync = FALSE,

                            wxProcess *process = (wxProcess *) NULL);
 
 #define wxSIGTERM 1
                            wxProcess *process = (wxProcess *) NULL);
 
 #define wxSIGTERM 1

diff --git a/src/common/docview.cpp b/src/common/docview.cpp
index 2ab0f4cd24503c7ea0344a52205b6d84f466d6c2..e686d80d9b76c65d03513ae98d01a2f1762ad584 100644 (file)
--- a/src/common/docview.cpp
+++ b/src/common/docview.cpp
@@ -46,8 +46,6 @@
 #include "wx/choicdlg.h"
 #include "wx/docview.h"
 #include "wx/printdlg.h"
 #include "wx/choicdlg.h"
 #include "wx/docview.h"
 #include "wx/printdlg.h"

-#include "wx/generic/prntdlgg.h"
-#include "wx/generic/printps.h"

 #include "wx/confbase.h"
 
 #include <stdio.h>
 #include "wx/confbase.h"
 
 #include <stdio.h>


@@ -744,20 +742,8 @@ void wxDocManager::OnPrint(wxCommandEvent& WXUNUSED(event))
   wxPrintout *printout = view->OnCreatePrintout();
   if (printout)
   {
   wxPrintout *printout = view->OnCreatePrintout();
   if (printout)
   {

-    // TODO: trouble about this is that it pulls in the postscript
-    // code unecessarily
-#ifdef __WXMSW__
-    if ( wxTheApp->GetPrintMode() == wxPRINT_WINDOWS )
-    {
-      wxWindowsPrinter printer;
-      printer.Print(view->GetFrame(), printout, TRUE);
-    }
-    else
-#endif
-    {
-      wxPostScriptPrinter printer;
-      printer.Print(view->GetFrame(), printout, TRUE);
-    }
+    wxPrinter printer;
+    printer.Print(view->GetFrame(), printout, TRUE);

 
     delete printout;
   }
 
     delete printout;
   }


@@ -772,20 +758,9 @@ void wxDocManager::OnPrintSetup(wxCommandEvent& WXUNUSED(event))
 
   wxPrintData data;
 
 
   wxPrintData data;
 

-#ifdef __WXMSW__
-  if ( wxTheApp->GetPrintMode() == wxPRINT_WINDOWS )
-  {
-    wxPrintDialog printerDialog(parentWin, & data);
-    printerDialog.GetPrintData().SetSetupDialog(TRUE);
-    printerDialog.ShowModal();
-  }
-  else
-#endif
-  {
-    wxGenericPrintDialog printerDialog(parentWin, & data);
-    printerDialog.GetPrintData().SetSetupDialog(TRUE);
-    printerDialog.ShowModal();
-  }
+  wxPrintDialog printerDialog(parentWin, & data);
+  printerDialog.GetPrintData().SetSetupDialog(TRUE);
+  printerDialog.ShowModal();

 }
 
 void wxDocManager::OnPreview(wxCommandEvent& WXUNUSED(event))
 }
 
 void wxDocManager::OnPreview(wxCommandEvent& WXUNUSED(event))


@@ -799,12 +774,7 @@ void wxDocManager::OnPreview(wxCommandEvent& WXUNUSED(event))
   {
     // Pass two printout objects: for preview, and possible printing.
     wxPrintPreviewBase *preview = (wxPrintPreviewBase *) NULL;
   {
     // Pass two printout objects: for preview, and possible printing.
     wxPrintPreviewBase *preview = (wxPrintPreviewBase *) NULL;

-#ifdef __WXMSW__
-    if ( wxTheApp->GetPrintMode() == wxPRINT_WINDOWS )
-        preview = new wxWindowsPrintPreview(printout, view->OnCreatePrintout());
-    else
-#endif
-       preview = new wxPostScriptPrintPreview(printout, view->OnCreatePrintout());
+    preview = new wxPrintPreview(printout, view->OnCreatePrintout());

 
     wxPreviewFrame *frame = new wxPreviewFrame(preview, (wxFrame *)wxTheApp->GetTopWindow(), _("Print Preview"),
                wxPoint(100, 100), wxSize(600, 650));
 
     wxPreviewFrame *frame = new wxPreviewFrame(preview, (wxFrame *)wxTheApp->GetTopWindow(), _("Print Preview"),
                wxPoint(100, 100), wxSize(600, 650));

diff --git a/src/common/sckaddr.cpp b/src/common/sckaddr.cpp
index 94a2fe6aeccf1b8f5c78b35e1c90618873ad1e2f..db66326bb2fdea5e63f91e34675cc283c3cebec5 100644 (file)
--- a/src/common/sckaddr.cpp
+++ b/src/common/sckaddr.cpp
@@ -41,6 +41,9 @@
 #include <socket.h>
 #include <in.h>
 #else
 #include <socket.h>
 #include <in.h>
 #else

+#if defined(__FreeBSD__) || defined (__NetBSD__)
+#include <sys/types.h>
+#endif

 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>