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

stream compile fixes

Browse Source 
bitmap, icon, imaglist work (broken)
notebook client resize fixed (ugly)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@237 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1998-07-12 20:06:59 +00:00
parent 3cacae09fa
commit 219f895a27
25 changed files with 433 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/generic/imaglist.h
View File

@@ -47,7 +47,7 @@ class wxImageList: public wxObject
public:
wxImageList::wxImageList() { }
wxImageList(int width, int height, bool mask = TRUE, int initialCount = 1);
wxImageList( int width, int height, bool mask = TRUE, int initialCount = 1 );
~wxImageList();
bool Create();
int GetImageCount() const;
@@ -62,6 +62,8 @@ class wxImageList: public wxObject
private:
wxList m_images;
int m_width;
int m_height;
};
#endif // __IMAGELISTH_G__

6
include/wx/gtk/bitmap.h
View File

@@ -102,6 +102,8 @@ class wxBitmap: public wxObject
wxMask *GetMask(void) const;
void SetMask( wxMask *mask );
void Resize( int height, int width );
bool SaveFile( const wxString &name, int type, wxPalette *palette = NULL );
bool LoadFile( const wxString &name, int type );
@@ -121,6 +123,10 @@ class wxBitmap: public wxObject
GdkPixmap *GetPixmap(void) const;
GdkBitmap *GetBitmap(void) const;
void DestroyImage(void);
void RecreateImage(void);
void Render(void);
// no data :-)
};

4
include/wx/gtk/frame.h
View File

@@ -70,7 +70,9 @@ class wxFrame: public wxWindow
wxString GetTitle(void) const;
void OnActivate( wxActivateEvent &WXUNUSED(event) ) {};
void GtkOnSize( int width, int height );
//private:
void GtkOnSize( int x, int y, int width, int height );
private:

5
include/wx/gtk/icon.h
View File

@@ -40,11 +40,8 @@ public:
inline wxIcon(const wxIcon& icon) { Ref(icon); }
inline wxIcon(const wxIcon* icon) { if (icon) Ref(*icon); }
wxIcon( char **bits, int width=-1, int height=-1 );
// Don't change this. Robert.
wxIcon( char **bits, int WXUNUSED(width), int WXUNUSED(height) ) :
wxBitmap( bits ) {};
inline wxIcon& operator = (const wxIcon& icon) { if (*this == icon) return (*this); Ref(icon); return *this; }
inline bool operator == (const wxIcon& icon) { return m_refData == icon.m_refData; }
inline bool operator != (const wxIcon& icon) { return m_refData != icon.m_refData; }

5
include/wx/gtk/notebook.h
View File

@@ -31,6 +31,7 @@ class wxNotebookPage;
// ----------------------------------------------------------------------------
// notebook events
// ----------------------------------------------------------------------------
class wxNotebookEvent : public wxCommandEvent
{
public:
@@ -139,10 +140,6 @@ public:
// base class virtuals
virtual void AddChild(wxWindow *child);
protected:
// wxWin callbacks
void OnSize(wxSizeEvent& event);
private:
// common part of all ctors
void Init();

6
include/wx/gtk1/bitmap.h
View File

@@ -102,6 +102,8 @@ class wxBitmap: public wxObject
wxMask *GetMask(void) const;
void SetMask( wxMask *mask );
void Resize( int height, int width );
bool SaveFile( const wxString &name, int type, wxPalette *palette = NULL );
bool LoadFile( const wxString &name, int type );
@@ -121,6 +123,10 @@ class wxBitmap: public wxObject
GdkPixmap *GetPixmap(void) const;
GdkBitmap *GetBitmap(void) const;
void DestroyImage(void);
void RecreateImage(void);
void Render(void);
// no data :-)
};

4
include/wx/gtk1/frame.h
View File

@@ -70,7 +70,9 @@ class wxFrame: public wxWindow
wxString GetTitle(void) const;
void OnActivate( wxActivateEvent &WXUNUSED(event) ) {};
void GtkOnSize( int width, int height );
//private:
void GtkOnSize( int x, int y, int width, int height );
private:

5
include/wx/gtk1/icon.h
View File

@@ -40,11 +40,8 @@ public:
inline wxIcon(const wxIcon& icon) { Ref(icon); }
inline wxIcon(const wxIcon* icon) { if (icon) Ref(*icon); }
wxIcon( char **bits, int width=-1, int height=-1 );
// Don't change this. Robert.
wxIcon( char **bits, int WXUNUSED(width), int WXUNUSED(height) ) :
wxBitmap( bits ) {};
inline wxIcon& operator = (const wxIcon& icon) { if (*this == icon) return (*this); Ref(icon); return *this; }
inline bool operator == (const wxIcon& icon) { return m_refData == icon.m_refData; }
inline bool operator != (const wxIcon& icon) { return m_refData != icon.m_refData; }

5
include/wx/gtk1/notebook.h
View File

@@ -31,6 +31,7 @@ class wxNotebookPage;
// ----------------------------------------------------------------------------
// notebook events
// ----------------------------------------------------------------------------
class wxNotebookEvent : public wxCommandEvent
{
public:
@@ -139,10 +140,6 @@ public:
// base class virtuals
virtual void AddChild(wxWindow *child);
protected:
// wxWin callbacks
void OnSize(wxSizeEvent& event);
private:
// common part of all ctors
void Init();

3
include/wx/mstream.h
View File

@@ -11,7 +11,8 @@
#ifndef __WXMMSTREAM_H__
#define __WXMMSTREAM_H__
#include <wx/stream.h>
#include "wx/object.h"
#include "wx/stream.h"
class wxMemoryStreamBase: public wxStream {
DECLARE_CLASS(wxMemoryStreamBase)

6
include/wx/stream.h
View File

@@ -91,7 +91,7 @@ class wxFilterInputStream: public wxInputStream {
wxInputStream *m_parent_i_stream;
};
class wxFilterOuputStream: pubilc wxOutputStream {
class wxFilterOutputStream: public wxOutputStream {
DECLARE_CLASS(wxFilterOutputStream)
public:
wxFilterOutputStream(wxOutputStream& stream);
@@ -102,8 +102,8 @@ class wxFilterOuputStream: pubilc wxOutputStream {
virtual size_t SeekO(int pos, wxWhenceType whence = wxBeginPosition)
{ return m_parent_o_stream->SeekO(pos, whence); }
virtual bool Eof() const { return m_parent_o_sream->Eof(); }
virtual size_t LastRead() const { return m_parent_o_stream->LastRead(); }
virtual bool Bad() const { return m_parent_o_stream->Bad(); }
virtual size_t LastWrite() const { return m_parent_o_stream->LastWrite(); }
protected:
wxOutputStream *m_parent_o_stream;