aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2004-01-11 12:48:46 (GMT)
committerfluxgen <fluxgen>2004-01-11 12:48:46 (GMT)
commitabe0204256a567799ea7f97db64e1153c5578660 (patch)
tree8e4399efddbb1fe294f2f8244b2accff3fd97aaa
parent135579a9bfa6a23a1fd8217ae15ea4d4937fbf59 (diff)
downloadfluxbox_pavel-abe0204256a567799ea7f97db64e1153c5578660.zip
fluxbox_pavel-abe0204256a567799ea7f97db64e1153c5578660.tar.bz2
FbDrawable in constructor
-rw-r--r--src/FbTk/FbPixmap.cc11
-rw-r--r--src/FbTk/FbPixmap.hh7
2 files changed, 15 insertions, 3 deletions
diff --git a/src/FbTk/FbPixmap.cc b/src/FbTk/FbPixmap.cc
index edc0e53..bbc8fcb 100644
--- a/src/FbTk/FbPixmap.cc
+++ b/src/FbTk/FbPixmap.cc
@@ -19,7 +19,7 @@
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22// $Id: FbPixmap.cc,v 1.9 2004/01/08 22:05:34 fluxgen Exp $ 22// $Id: FbPixmap.cc,v 1.10 2004/01/11 12:48:46 fluxgen Exp $
23 23
24#include "FbPixmap.hh" 24#include "FbPixmap.hh"
25#include "App.hh" 25#include "App.hh"
@@ -50,6 +50,15 @@ FbPixmap::FbPixmap(Pixmap pm):m_pm(0),
50 (*this) = pm; 50 (*this) = pm;
51} 51}
52 52
53FbPixmap::FbPixmap(const FbDrawable &src,
54 unsigned int width, unsigned int height,
55 int depth):m_pm(0),
56 m_width(0), m_height(0),
57 m_depth(0) {
58
59 create(src.drawable(), width, height, depth);
60}
61
53FbPixmap::FbPixmap(Drawable src, 62FbPixmap::FbPixmap(Drawable src,
54 unsigned int width, unsigned int height, 63 unsigned int width, unsigned int height,
55 int depth):m_pm(0), 64 int depth):m_pm(0),
diff --git a/src/FbTk/FbPixmap.hh b/src/FbTk/FbPixmap.hh
index 2408c89..b0b7fed 100644
--- a/src/FbTk/FbPixmap.hh
+++ b/src/FbTk/FbPixmap.hh
@@ -19,7 +19,7 @@
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22// $Id: FbPixmap.hh,v 1.9 2004/01/08 22:05:58 fluxgen Exp $ 22// $Id: FbPixmap.hh,v 1.10 2004/01/11 12:48:46 fluxgen Exp $
23 23
24#ifndef FBTK_FBPIXMAP_HH 24#ifndef FBTK_FBPIXMAP_HH
25#define FBTK_FBPIXMAP_HH 25#define FBTK_FBPIXMAP_HH
@@ -38,11 +38,14 @@ public:
38 explicit FbPixmap(const FbPixmap &copy); 38 explicit FbPixmap(const FbPixmap &copy);
39 /// creates a FbPixmap from X pixmap 39 /// creates a FbPixmap from X pixmap
40 explicit FbPixmap(Pixmap pm); 40 explicit FbPixmap(Pixmap pm);
41 FbPixmap(const FbDrawable &src,
42 unsigned int width, unsigned int height,
43 int depth);
41 FbPixmap(Drawable src, 44 FbPixmap(Drawable src,
42 unsigned int width, unsigned int height, 45 unsigned int width, unsigned int height,
43 int depth); 46 int depth);
44 47
45 ~FbPixmap(); 48 virtual ~FbPixmap();
46 49
47 void copy(const FbPixmap &the_copy); 50 void copy(const FbPixmap &the_copy);
48 void copy(Pixmap pixmap); 51 void copy(Pixmap pixmap);