[Libreoffice-commits] .: Branch 'feature/layout' - 2 commits - README.layout vcl/inc

[Ricardo Cruz]

 README.layout          |   23 +++++++++++------------
 vcl/inc/vcl/button.hxx |    7 ++++---
 vcl/inc/vcl/outdev.hxx |    2 +-
 3 files changed, 16 insertions(+), 16 deletions(-)

New commits:
commit 70c44d75be3e4f6f874e8fd2ffd80a5f1c0b7774
Author: Ricardo Cruz <rpmcruz at alunos.dcc.fc.up.pt>
Date:   Sun Dec 19 21:09:07 2010 +0000

    Button shouldn't be instantiable: contructor made protected

diff --git a/README.layout b/README.layout
index b4e9861..ea2515d 100644
--- a/README.layout
+++ b/README.layout
@@ -61,11 +61,6 @@ trivial nevertheless.
   gray-ing out the inactive tabs. Offset inactive tab label
   content if we aren't doing that already.
 * Buttons flickers quite a bit on focus-in and focus-out.
-* Button: shouldn't be possible to create an instance of
-  this base class: only of PushButton or whatever. The
-  names are too similar and you can easily use Button
-  by mistake, and only notice the mistake on run-time, not
-  while compiling.
 
 HACKING                                  -=-=-=-=-=-=-=-=-=
 
commit b3b1346702007e8ceceb15d984247d93edb92706
Author: Ricardo Cruz <rpmcruz at alunos.dcc.fc.up.pt>
Date:   Sun Dec 19 21:08:33 2010 +0000

    Button shouldn't be instantiable: contructor made protected

diff --git a/README.layout b/README.layout
index 6eaa501..b4e9861 100644
--- a/README.layout
+++ b/README.layout
@@ -60,7 +60,7 @@ trivial nevertheless.
   bold font for the selected tab page: replace that by
   gray-ing out the inactive tabs. Offset inactive tab label
   content if we aren't doing that already.
-* Buttons flicker quite a bit on focus-in and focus-out.
+* Buttons flickers quite a bit on focus-in and focus-out.
 * Button: shouldn't be possible to create an instance of
   this base class: only of PushButton or whatever. The
   names are too similar and you can easily use Button
@@ -72,7 +72,7 @@ HACKING                                  -=-=-=-=-=-=-=-=-=
 Some information about the vcl layout code. Useful for both
 people who want to hack on it, or with it.
 
-
+               ~~~~~~~~~~
 align.hxx, box.hxx, notebook.hxx, buttonbox.hxx, table.hxx
 
  The stars of the show.
@@ -94,11 +94,11 @@ align.hxx, box.hxx, notebook.hxx, buttonbox.hxx, table.hxx
     box->Pack (Widget (window), true);
  We already do that internally.
 
-~~~~~~~~~~
-
+               ~~~~~~~~~~
 ldialog.hxx
 
- Probably better to use this one as your top-level.
+ Probably better to use this one as your top-level,
+ but need not be.
 
  The default size will be one enough to show all its
  children.
@@ -106,8 +106,7 @@ ldialog.hxx
  To overload the default size (ie. to use a bigger size),
  lookup LDialog::SetDefaultSize().
 
-~~~~~~~~~~
-
+               ~~~~~~~~~~
 layout.hxx
 
  Containers must implement this interface. A container
@@ -125,3 +124,8 @@ layout.hxx
  class to take advantage of it.
  The method will queue and defer geometry recalculations.
 
+CONTACTS                                  -=-=-=-=-=-=-=-=-=
+
+Ricardo Cruz <rpmcruz at alunos.dcc.fc.up.pt>
+Michael Meeks <michael.meeks at novell.com>
+
diff --git a/vcl/inc/vcl/button.hxx b/vcl/inc/vcl/button.hxx
index 206a956..3bad4fe 100644
--- a/vcl/inc/vcl/button.hxx
+++ b/vcl/inc/vcl/button.hxx
@@ -73,10 +73,11 @@ public:
 protected:
                         Button( WindowType nType );
 
-public:
-                        Button( Window* pParent, WinBits nStyle = 0 );
+                        Button( Window* pParent, WinBits nStyle );
                         Button( Window* pParent, const ResId& rResId );
-                       ~Button();
+
+public:
+    virtual            ~Button();
 
     virtual void        Click();
     virtual void		DataChanged( const DataChangedEvent& rDCEvt );
diff --git a/vcl/inc/vcl/outdev.hxx b/vcl/inc/vcl/outdev.hxx
index e975de6..d0cb5b4 100644
--- a/vcl/inc/vcl/outdev.hxx
+++ b/vcl/inc/vcl/outdev.hxx
@@ -1115,7 +1115,7 @@ public:
 
     /** Added return value to see if EPS could be painted directly.
         Theoreticaly, handing over a matrix would be needed to handle
-        painting rotated EPS files (e.g. contained mín Metafiles). This
+        painting rotated EPS files (e.g. contained mín Metafiles). This
         would then need to be supported for Mac and PS printers, but
         that's too much for now, wrote #i107046# for this */
     bool                DrawEPS( const Point& rPt, const Size& rSz,