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

wxFrame::CreateToolBar() stuff

Browse Source 
wxDC::SetBackground from Chris Breeze
zillions of compile fixes


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@364 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1998-07-24 19:05:25 +00:00
parent d602f1d8b6
commit 46dc76ba35
53 changed files with 645 additions and 376 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/wx/file.h
View File

@@ -21,8 +21,6 @@
#include "wx/filefn.h"
// ----------------------------------------------------------------------------
<<<<<<< file.h
=======
// constants
// ----------------------------------------------------------------------------
@@ -47,7 +45,6 @@ const off_t ofsInvalid = (off_t)-1;
#define wxS_DEFAULT (wxS_IRUSR | wxS_IWUSR | wxS_IRGRP | wxS_IROTH)
// ----------------------------------------------------------------------------
>>>>>>> 1.7
// class wxFile: raw file IO
//
// NB: for space efficiency this class has no virtual functions, including
@@ -78,11 +75,6 @@ public:
wxFile(int fd) { m_fd = fd; }
// open/close
<<<<<<< file.h
bool Create(const char *szFileName, bool bOverwrite = FALSE);
bool Open(const char *szFileName, OpenMode mode = read);
inline bool Close(); // Close is a NOP if not opened
=======
// create a new file (with the default value of bOverwrite, it will fail if
// the file already exists, otherwise it will overwrite it and succeed)
bool Create(const char *szFileName, bool bOverwrite = FALSE,
@@ -90,7 +82,6 @@ public:
bool Open(const char *szFileName, OpenMode mode = read,
int access = wxS_DEFAULT);
bool Close(); // Close is a NOP if not opened
>>>>>>> 1.7
// assign an existing file descriptor and get it back from wxFile object
void Attach(int fd) { Close(); m_fd = fd; }

3
include/wx/gtk/dc.h
View File

@@ -119,6 +119,9 @@ class wxDC: public wxObject
virtual void SetBrush( const wxBrush &brush ) = 0;
virtual wxBrush *GetBrush(void) { return &m_brush; };
virtual void SetBackground( const wxBrush &brush ) = 0;
virtual wxBrush *GetBackground(void) { return &m_backgroundBrush; };
virtual void SetLogicalFunction( int function ) = 0;
virtual int GetLogicalFunction(void) { return m_logicalFunction; };

1
include/wx/gtk/dcclient.h
View File

@@ -80,6 +80,7 @@ class wxPaintDC: public wxDC
virtual void SetFont( const wxFont &font );
virtual void SetPen( const wxPen &pen );
virtual void SetBrush( const wxBrush &brush );
virtual void SetBackground( const wxBrush &brush );
virtual void SetLogicalFunction( int function );
virtual void SetTextForeground( const wxColour &col );
virtual void SetTextBackground( const wxColour &col );

2
include/wx/gtk/dnd.h
View File

@@ -35,7 +35,7 @@ class wxTextDragSource;
// wxDropTarget
//-------------------------------------------------------------------------
class wxDropTarget: wxObject
class wxDropTarget: public wxObject
{
public:

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

@@ -21,6 +21,7 @@
#include "wx/window.h"
#include "wx/menu.h"
#include "wx/statusbr.h"
#include "wx/toolbar.h"
//-----------------------------------------------------------------------------
// classes
@@ -42,8 +43,9 @@ extern const char *wxFrameNameStr;
class wxFrame: public wxWindow
{
DECLARE_DYNAMIC_CLASS(wxFrame)
public:
// construction
wxFrame();
wxFrame( wxWindow *parent, wxWindowID id, const wxString &title,
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
@@ -54,38 +56,35 @@ public:
~wxFrame();
bool Destroy();
// operations
//
virtual bool Show( bool show );
virtual void Enable( bool enable );
// frame size
virtual void GetClientSize( int *width, int *height ) const;
// set minimal size for the frame (@@@ other params not implemented)
void SetSizeHints(int minW, int minH,
int maxW = -1, int maxH = -1,
int incW = -1);
// set minimal/maxmimal size for the frame
virtual void SetSizeHints( int minW, int minH, int maxW, int maxH, int incW = -1 );
// status bar
virtual bool CreateStatusBar( int number = 1 );
wxStatusBar *GetStatusBar();
virtual wxStatusBar *GetStatusBar();
virtual void SetStatusText( const wxString &text, int number = 0 );
virtual void SetStatusWidths( int n, int *width );
// menu bar
void SetMenuBar( wxMenuBar *menuBar );
wxMenuBar *GetMenuBar();
virtual wxToolBar *CreateToolBar( int style = 0,
int orientation = wxHORIZONTAL, int rowsOrColumns = 1 );
virtual wxToolBar *GetToolBar();
virtual void SetMenuBar( wxMenuBar *menuBar );
virtual wxMenuBar *GetMenuBar();
// frame title
void SetTitle( const wxString &title );
wxString GetTitle() const { return m_title; }
// implementation
void OnActivate( wxActivateEvent &event ) { } // called from docview.cpp
void OnActivate( wxActivateEvent &WXUNUSED(event) ) { } // called from docview.cpp
void OnSize( wxSizeEvent &event );
void OnCloseWindow( wxCloseEvent& event );
void OnIdle(wxIdleEvent& event);
virtual void AddChild( wxWindow *child );
virtual void GtkOnSize( int x, int y, int width, int height );
private:
@@ -99,10 +98,12 @@ private:
GtkWidget *m_mainWindow;
wxMenuBar *m_frameMenuBar;
wxStatusBar *m_frameStatusBar;
wxToolBar *m_frameToolBar;
int m_toolBarHeight;
bool m_doingOnSize;
bool m_addPrivateChild; // for toolbar (and maybe menubar)
wxString m_title;
DECLARE_DYNAMIC_CLASS(wxFrame)
DECLARE_EVENT_TABLE()
};

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

@@ -68,9 +68,6 @@ class wxMDIParentFrame: public wxFrame
void GetClientSize(int *width, int *height) const;
wxMDIChildFrame *GetActiveChild(void) const;
virtual void SetToolBar( wxToolBar *toolbar );
virtual wxWindow *GetToolBar(void) const;
wxMDIClientWindow *GetClientWindow(void) const;
virtual wxMDIClientWindow *OnCreateClient(void);
@@ -95,7 +92,6 @@ class wxMDIParentFrame: public wxFrame
wxMDIClientWindow *m_clientWindow;
bool m_parentFrameActive;
wxMenuBar *m_mdiMenuBar;
wxToolBar *m_toolBar;
DECLARE_EVENT_TABLE()
};

2
include/wx/gtk/tbargtk.h
View File

@@ -112,6 +112,8 @@ class wxToolBar: public wxControl
const wxString& helpString1 = "", const wxString& helpString2 = "");
virtual void AddSeparator(void);
virtual void ClearTools(void);
virtual void Layout(void);
virtual void EnableTool(int toolIndex, bool enable);
virtual void ToggleTool(int toolIndex, bool toggle); // toggle is TRUE if toggled on

3
include/wx/gtk1/dc.h
View File

@@ -119,6 +119,9 @@ class wxDC: public wxObject
virtual void SetBrush( const wxBrush &brush ) = 0;
virtual wxBrush *GetBrush(void) { return &m_brush; };
virtual void SetBackground( const wxBrush &brush ) = 0;
virtual wxBrush *GetBackground(void) { return &m_backgroundBrush; };
virtual void SetLogicalFunction( int function ) = 0;
virtual int GetLogicalFunction(void) { return m_logicalFunction; };

1
include/wx/gtk1/dcclient.h
View File

@@ -80,6 +80,7 @@ class wxPaintDC: public wxDC
virtual void SetFont( const wxFont &font );
virtual void SetPen( const wxPen &pen );
virtual void SetBrush( const wxBrush &brush );
virtual void SetBackground( const wxBrush &brush );
virtual void SetLogicalFunction( int function );
virtual void SetTextForeground( const wxColour &col );
virtual void SetTextBackground( const wxColour &col );

2
include/wx/gtk1/dnd.h
View File

@@ -35,7 +35,7 @@ class wxTextDragSource;
// wxDropTarget
//-------------------------------------------------------------------------
class wxDropTarget: wxObject
class wxDropTarget: public wxObject
{
public:

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

@@ -21,6 +21,7 @@
#include "wx/window.h"
#include "wx/menu.h"
#include "wx/statusbr.h"
#include "wx/toolbar.h"
//-----------------------------------------------------------------------------
// classes
@@ -42,8 +43,9 @@ extern const char *wxFrameNameStr;
class wxFrame: public wxWindow
{
DECLARE_DYNAMIC_CLASS(wxFrame)
public:
// construction
wxFrame();
wxFrame( wxWindow *parent, wxWindowID id, const wxString &title,
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
@@ -54,38 +56,35 @@ public:
~wxFrame();
bool Destroy();
// operations
//
virtual bool Show( bool show );
virtual void Enable( bool enable );
// frame size
virtual void GetClientSize( int *width, int *height ) const;
// set minimal size for the frame (@@@ other params not implemented)
void SetSizeHints(int minW, int minH,
int maxW = -1, int maxH = -1,
int incW = -1);
// set minimal/maxmimal size for the frame
virtual void SetSizeHints( int minW, int minH, int maxW, int maxH, int incW = -1 );
// status bar
virtual bool CreateStatusBar( int number = 1 );
wxStatusBar *GetStatusBar();
virtual wxStatusBar *GetStatusBar();
virtual void SetStatusText( const wxString &text, int number = 0 );
virtual void SetStatusWidths( int n, int *width );
// menu bar
void SetMenuBar( wxMenuBar *menuBar );
wxMenuBar *GetMenuBar();
virtual wxToolBar *CreateToolBar( int style = 0,
int orientation = wxHORIZONTAL, int rowsOrColumns = 1 );
virtual wxToolBar *GetToolBar();
virtual void SetMenuBar( wxMenuBar *menuBar );
virtual wxMenuBar *GetMenuBar();
// frame title
void SetTitle( const wxString &title );
wxString GetTitle() const { return m_title; }
// implementation
void OnActivate( wxActivateEvent &event ) { } // called from docview.cpp
void OnActivate( wxActivateEvent &WXUNUSED(event) ) { } // called from docview.cpp
void OnSize( wxSizeEvent &event );
void OnCloseWindow( wxCloseEvent& event );
void OnIdle(wxIdleEvent& event);
virtual void AddChild( wxWindow *child );
virtual void GtkOnSize( int x, int y, int width, int height );
private:
@@ -99,10 +98,12 @@ private:
GtkWidget *m_mainWindow;
wxMenuBar *m_frameMenuBar;
wxStatusBar *m_frameStatusBar;
wxToolBar *m_frameToolBar;
int m_toolBarHeight;
bool m_doingOnSize;
bool m_addPrivateChild; // for toolbar (and maybe menubar)
wxString m_title;
DECLARE_DYNAMIC_CLASS(wxFrame)
DECLARE_EVENT_TABLE()
};

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

@@ -68,9 +68,6 @@ class wxMDIParentFrame: public wxFrame
void GetClientSize(int *width, int *height) const;
wxMDIChildFrame *GetActiveChild(void) const;
virtual void SetToolBar( wxToolBar *toolbar );
virtual wxWindow *GetToolBar(void) const;
wxMDIClientWindow *GetClientWindow(void) const;
virtual wxMDIClientWindow *OnCreateClient(void);
@@ -95,7 +92,6 @@ class wxMDIParentFrame: public wxFrame
wxMDIClientWindow *m_clientWindow;
bool m_parentFrameActive;
wxMenuBar *m_mdiMenuBar;
wxToolBar *m_toolBar;
DECLARE_EVENT_TABLE()
};

2
include/wx/gtk1/tbargtk.h
View File

@@ -112,6 +112,8 @@ class wxToolBar: public wxControl
const wxString& helpString1 = "", const wxString& helpString2 = "");
virtual void AddSeparator(void);
virtual void ClearTools(void);
virtual void Layout(void);
virtual void EnableTool(int toolIndex, bool enable);
virtual void ToggleTool(int toolIndex, bool toggle); // toggle is TRUE if toggled on

3
include/wx/intl.h
View File

@@ -107,7 +107,8 @@ private:
// ----------------------------------------------------------------------------
// global functions
// ----------------------------------------------------------------------------
inline WXDLLEXPORT wxLocale* wxGetLocale() { return g_pLocale; }
WXDLLEXPORT wxLocale* wxGetLocale();
// get the translation of the string in the current locale
inline WXDLLEXPORT const char *wxGetTranslation(const char *sz)

5
include/wx/list.h
View File

@@ -76,11 +76,6 @@ class WXDLLEXPORT wxList: public wxObject
wxList(int N, wxObject *Objects[]);
wxList(wxObject *object, ...);
#ifdef USE_STORABLE_CLASSES
wxList( istream &stream, char *data );
virtual void StoreObject( ostream &stream );
#endif
~wxList(void);
inline int Number(void) const { return n; }

13
include/wx/matrix.h
View File

@@ -97,19 +97,24 @@ public:
*/
};
/*
The code is wrong and doesn't compile. Chris Breeze als reported, that
some functions of wxTransformMatrix cannot work because it is not
known if he matrix has been inverted. Be careful when using it.
// Transform X value from logical to device
inline double wxTransformMatrix::TransformX(double x) const
{
// return (m_isIdentity ? x : (x * m_matrix[0][0] + y * m_matrix[1][0] + m_matrix[2][0]));
return 0;
return (m_isIdentity ? x : (x * m_matrix[0][0] + y * m_matrix[1][0] + m_matrix[2][0]));
}
// Transform Y value from logical to device
inline double wxTransformMatrix::TransformY(double y) const
{
// return (m_isIdentity ? y : (x * m_matrix[0][1] + y * m_matrix[1][1] + m_matrix[2][1]));
return 0;
return (m_isIdentity ? y : (x * m_matrix[0][1] + y * m_matrix[1][1] + m_matrix[2][1]));
}
*/
// Is the matrix the identity matrix?
// Perhaps there's some kind of optimization we can do to make this

6
include/wx/zstream.h
View File

@@ -16,7 +16,7 @@
#endif
#include <wx/stream.h>
#include "zlib.h"
#include "../zlib/zlib.h"
class wxZlibInputStream: public wxFilterInputStream {
public:
@@ -27,7 +27,7 @@ class wxZlibInputStream: public wxFilterInputStream {
protected:
size_t DoRead(void *buffer, size_t size);
off_t DoSeekInput(off_t pos, wxSeekMode WXUNUSED(mode)) { return wxInvalidOffset; }
off_t DoSeekInput(off_t WXUNUSED(pos), wxSeekMode WXUNUSED(mode)) { return wxInvalidOffset; }
off_t DoTellInput() const { return wxInvalidOffset; }
protected:
@@ -47,7 +47,7 @@ class wxZlibOutputStream: public wxFilterOutputStream {
protected:
size_t DoWrite(const void *buffer, size_t size);
off_t DoSeekOutput(off_t pos, wxSeekMode WXUNUSED(mode)) { return wxInvalidOffset; }
off_t DoSeekOutput(off_t WXUNUSED(pos), wxSeekMode WXUNUSED(mode)) { return wxInvalidOffset; }
off_t DoTellOutput() const { return wxInvalidOffset; }
protected: