Compile fix for dynarray,

Use wxStreams in dialoged,
  Small typo in wxApp::OnIdle()
  Distrib things,
  wxPython makefile corrections (libpy.c and libptr.c missing)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3295 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1999-08-05 20:38:51 +00:00
parent 48e74ff549
commit e70f5e1301
16 changed files with 45 additions and 92 deletions

View File

@@ -29,16 +29,6 @@
#include <math.h>
#include <string.h>
#if wxUSE_IOSTREAMH
#if defined(__WXMSW__) && !defined(__GNUWIN32__)
#include <strstrea.h>
#else
#include <strstream.h>
#endif
#else
#include <strstream>
#endif
#include "reseditr.h"
#include "winprop.h"
#include "dlghndlr.h"

View File

@@ -44,16 +44,6 @@
#include <math.h>
#include <string.h>
#if wxUSE_IOSTREAMH
#if defined(__WXMSW__) && !defined(__GNUWIN32__)
#include <strstrea.h>
#else
#include <strstream.h>
#endif
#else
#include <strstream>
#endif
#ifdef __WXMSW__
#include "wx/help.h"
#endif

View File

@@ -26,6 +26,7 @@
#include "wx/imaglist.h"
#include "wx/treectrl.h"
#include "wx/proplist.h"
#include "wx/txtstrm.h"
#include "symbtabl.h"
#include "winstyle.h"
@@ -117,7 +118,7 @@ class wxResourceTableWithSaving: public wxResourceTable
m_styleTable.Init();
}
virtual bool Save(const wxString& filename);
virtual bool SaveResource(ostream& stream, wxItemResource* item, wxItemResource* parentItem);
virtual bool SaveResource(wxTextOutputStream& stream, wxItemResource* item, wxItemResource* parentItem);
void GeneratePanelStyleString(long windowStyle, char *buf);
void GenerateDialogStyleString(long windowStyle, char *buf);
@@ -144,7 +145,7 @@ class wxResourceTableWithSaving: public wxResourceTable
bool GenerateStyle(char *buf, long windowStyle, long flag, char *strStyle);
*/
void OutputFont(ostream& stream, const wxFont& font);
void OutputFont(wxTextOutputStream& stream, const wxFont& font);
wxControl *CreateItem(wxPanel *panel, const wxItemResource *childResource, const wxItemResource* parentResource);
protected:

View File

@@ -29,21 +29,10 @@
#include <math.h>
#include <string.h>
#if wxUSE_IOSTREAMH
#if defined(__WXMSW__) && !defined(__GNUWIN32__)
#include <strstrea.h>
#include <fstream.h>
#else
#include <strstream.h>
#include <fstream.h>
#endif
#else
#include <strstream>
#include <fstream>
#endif
#include "wx/scrolbar.h"
#include "wx/string.h"
#include "wx/wfstream.h"
#include "wx/txtstrm.h"
#include "reseditr.h"
@@ -60,7 +49,7 @@ wxControl *wxResourceTableWithSaving::CreateItem(wxPanel *panel, const wxItemRes
return item;
}
void wxResourceTableWithSaving::OutputFont(ostream& stream, const wxFont& font)
void wxResourceTableWithSaving::OutputFont(wxTextOutputStream& stream, const wxFont& font)
{
stream << "[" << font.GetPointSize() << ", '";
stream << font.GetFamilyString() << "', '";
@@ -78,10 +67,12 @@ void wxResourceTableWithSaving::OutputFont(ostream& stream, const wxFont& font)
bool wxResourceTableWithSaving::Save(const wxString& filename)
{
ofstream stream(((wxString &) filename).GetData());
if (stream.bad())
wxFileOutputStream file_output( filename.fn_str() );
if (file_output.LastError())
return FALSE;
wxTextOutputStream stream( file_output );
BeginFind();
wxNode *node = NULL;
while ((node = Next()))
@@ -98,7 +89,7 @@ bool wxResourceTableWithSaving::Save(const wxString& filename)
return TRUE;
}
bool wxResourceTableWithSaving::SaveResource(ostream& stream, wxItemResource* item, wxItemResource* parentItem)
bool wxResourceTableWithSaving::SaveResource(wxTextOutputStream& stream, wxItemResource* item, wxItemResource* parentItem)
{
char styleBuf[400];
wxString itemType(item->GetType());

View File

@@ -29,16 +29,6 @@
#include <math.h>
#include <string.h>
#if wxUSE_IOSTREAMH
#if defined(__WXMSW__) && !defined(__GNUWIN32__)
#include <strstrea.h>
#else
#include <strstream.h>
#endif
#else
#include <strstream>
#endif
#ifdef __WXMSW__
#include <windows.h>
#endif