Use some wxX11 files (currently pen.cpp and brush.cpp) in wxMotif.
Add src/x11 to VPATH in configure, and add a new flag to filelist.txt indicating a file used in wxMotif but not in wxMotif directory. Modifed VMS makefiles, too (should be checked by someone with VMS, though). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19265 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -16,15 +16,16 @@
|
||||
#pragma interface "pen.h"
|
||||
#endif
|
||||
|
||||
#include "wx/gdicmn.h"
|
||||
#include "wx/gdiobj.h"
|
||||
#include "wx/colour.h"
|
||||
#include "wx/bitmap.h"
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// classes
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
class wxPen;
|
||||
class wxColour;
|
||||
class wxBitmap;
|
||||
|
||||
typedef char wxX11Dash;
|
||||
|
||||
@@ -38,6 +39,7 @@ public:
|
||||
wxPen() { }
|
||||
|
||||
wxPen( const wxColour &colour, int width, int style );
|
||||
wxPen( const wxBitmap &stipple, int width );
|
||||
~wxPen();
|
||||
|
||||
wxPen( const wxPen& pen ) { Ref(pen); }
|
||||
@@ -55,7 +57,8 @@ public:
|
||||
void SetStyle( int style );
|
||||
void SetWidth( int width );
|
||||
void SetDashes( int number_of_dashes, const wxDash *dash );
|
||||
|
||||
void SetStipple( wxBitmap *stipple );
|
||||
|
||||
wxColour &GetColour() const;
|
||||
int GetCap() const;
|
||||
int GetJoin() const;
|
||||
@@ -64,6 +67,7 @@ public:
|
||||
int GetDashes(wxDash **ptr) const;
|
||||
int GetDashCount() const;
|
||||
wxDash* GetDash() const;
|
||||
wxBitmap* GetStipple() const;
|
||||
|
||||
private:
|
||||
// ref counting code
|
||||
|
Reference in New Issue
Block a user