Applied fixes for AIX (GTK 1.0 compilation).
Removed ostream from property classes. Removed Lisp output from wxExpr. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2917 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -75,7 +75,7 @@ public:
|
||||
void SetBitmapLabel( const wxBitmap& bitmap );
|
||||
void SetBitmapSelected( const wxBitmap& bitmap );
|
||||
|
||||
virtual bool Enable(const bool);
|
||||
virtual bool Enable(bool enable);
|
||||
|
||||
// implementation
|
||||
|
||||
|
@@ -75,7 +75,7 @@ public:
|
||||
void SetBitmapLabel( const wxBitmap& bitmap );
|
||||
void SetBitmapSelected( const wxBitmap& bitmap );
|
||||
|
||||
virtual bool Enable(const bool);
|
||||
virtual bool Enable(bool enable);
|
||||
|
||||
// implementation
|
||||
|
||||
|
@@ -67,9 +67,6 @@ class WXDLLEXPORT wxPropertySheet: public wxObject
|
||||
// Clear all properties
|
||||
virtual void Clear(void);
|
||||
|
||||
virtual bool Save(ostream& str);
|
||||
virtual bool Load(ostream& str);
|
||||
|
||||
virtual void UpdateAllViews(wxPropertyView *thisView = NULL);
|
||||
inline virtual wxList& GetProperties(void) const { return (wxList&) m_properties; }
|
||||
|
||||
@@ -231,8 +228,8 @@ class WXDLLEXPORT wxPropertyValue: public wxObject
|
||||
virtual wxPropertyValue *NewCopy(void) const;
|
||||
virtual void Copy(wxPropertyValue& copyFrom);
|
||||
|
||||
virtual void WritePropertyClause(ostream& stream); // Write this expression as a top-level clause
|
||||
virtual void WritePropertyType(ostream& stream); // Write as any other subexpression
|
||||
virtual void WritePropertyClause(wxString &stream); // Write this expression as a top-level clause
|
||||
virtual void WritePropertyType(wxString &stream); // Write as any other subexpression
|
||||
|
||||
// Append an expression to a list
|
||||
virtual void Append(wxPropertyValue *expr);
|
||||
|
@@ -141,7 +141,6 @@ class WXDLLEXPORT wxExpr
|
||||
bool IsFunctor(const wxString& s) const; // Only for a clause
|
||||
void WriteClause(FILE* stream); // Write this expression as a top-level clause
|
||||
void WriteExpr(FILE* stream); // Write as any other subexpression
|
||||
void WriteLispExpr(FILE* stream);
|
||||
|
||||
// Append an expression to a list
|
||||
void Append(wxExpr *expr);
|
||||
@@ -243,7 +242,6 @@ public:
|
||||
bool ReadFromString(const wxString& buffer);
|
||||
bool Write(const wxString& fileName);
|
||||
bool Write(FILE* stream);
|
||||
void WriteLisp(FILE* stream);
|
||||
|
||||
// Compatibility
|
||||
inline bool ReadProlog(wxChar *filename) { return Read(wxString(filename)); }
|
||||
|
Reference in New Issue
Block a user