Improved selection mode handling in wxGrid::SelectBlock

[wxWidgets.git] / src / common / gdicmn.cpp

diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index d0f6c4199d636203569bc192e0cfa525cb883e95..472650c95c074b8af0ab96e7cc630cff237cabf8 100644 (file)
--- a/src/common/gdicmn.cpp
+++ b/src/common/gdicmn.cpp
@@ -50,16 +50,14 @@
 #endif
 #endif
 
 #endif
 #endif
 

-#if !USE_SHARED_LIBRARY
-    IMPLEMENT_CLASS(wxColourDatabase, wxList)
-    IMPLEMENT_DYNAMIC_CLASS(wxFontList, wxList)
-    IMPLEMENT_DYNAMIC_CLASS(wxPenList, wxList)
-    IMPLEMENT_DYNAMIC_CLASS(wxBrushList, wxList)
-    IMPLEMENT_DYNAMIC_CLASS(wxBitmapList, wxList)
-    IMPLEMENT_DYNAMIC_CLASS(wxResourceCache, wxList)
-
-    IMPLEMENT_ABSTRACT_CLASS(wxDCBase, wxObject)
-#endif
+IMPLEMENT_CLASS(wxColourDatabase, wxList)
+IMPLEMENT_DYNAMIC_CLASS(wxFontList, wxList)
+IMPLEMENT_DYNAMIC_CLASS(wxPenList, wxList)
+IMPLEMENT_DYNAMIC_CLASS(wxBrushList, wxList)
+IMPLEMENT_DYNAMIC_CLASS(wxBitmapList, wxList)
+IMPLEMENT_DYNAMIC_CLASS(wxResourceCache, wxList)
+
+IMPLEMENT_ABSTRACT_CLASS(wxDCBase, wxObject)

 
 wxRect::wxRect(const wxPoint& topLeft, const wxPoint& bottomRight)
 {
 
 wxRect::wxRect(const wxPoint& topLeft, const wxPoint& bottomRight)
 {


@@ -95,27 +93,27 @@ bool wxRect::operator==(const wxRect& rect) const
           (height == rect.height));
 }
 
           (height == rect.height));
 }
 

-const wxRect& wxRect::operator += (const wxRect& rect)
+wxRect& wxRect::operator += (const wxRect& rect)

 {
 {

-       *this = (*this + rect);
-       return ( *this ) ;
+    *this = (*this + rect);
+    return ( *this ) ;

 }
 
 wxRect wxRect::operator + (const wxRect& rect) const
 {
 }
 
 wxRect wxRect::operator + (const wxRect& rect) const
 {

-       int x1 = wxMin(this->x, rect.x);
-       int y1 = wxMin(this->y, rect.y);
-       int y2 = wxMax(y+height, rect.height+rect.y);
-       int x2 = wxMax(x+width, rect.width+rect.x);
-       return wxRect(x1, y1, x2-x1, y2-y1);
+    int x1 = wxMin(this->x, rect.x);
+    int y1 = wxMin(this->y, rect.y);
+    int y2 = wxMax(y+height, rect.height+rect.y);
+    int x2 = wxMax(x+width, rect.width+rect.x);
+    return wxRect(x1, y1, x2-x1, y2-y1);

 }
 
 bool wxRect::Inside(int cx, int cy) const
 {
 }
 
 bool wxRect::Inside(int cx, int cy) const
 {

-       return ( (cx >= x) && (cy >= y)
-                 && ((cy - y) < height)
-                 && ((cx - x) < width)
-                 );
+    return ( (cx >= x) && (cy >= y)
+          && ((cy - y) < height)
+          && ((cx - x) < width)
+          );

 }
 
 wxColourDatabase::wxColourDatabase (int type) : wxList (type)
 }
 
 wxColourDatabase::wxColourDatabase (int type) : wxList (type)


@@ -360,10 +358,17 @@ void wxInitializeStockObjects ()
   //  wxFontPool = new XFontPool;
 #endif
 
   //  wxFontPool = new XFontPool;
 #endif
 

-  wxNORMAL_FONT = new wxFont (12, wxMODERN, wxNORMAL, wxNORMAL);
-  wxSMALL_FONT = new wxFont (10, wxSWISS, wxNORMAL, wxNORMAL);
-  wxITALIC_FONT = new wxFont (12, wxROMAN, wxITALIC, wxNORMAL);
-  wxSWISS_FONT = new wxFont (12, wxSWISS, wxNORMAL, wxNORMAL);
+  // why under MSW fonts shouldn't have the standard system size?
+#ifdef __WXMSW__
+  static const int sizeFont = 10;
+#else
+  static const int sizeFont = 12;
+#endif
+
+  wxNORMAL_FONT = new wxFont (sizeFont, wxMODERN, wxNORMAL, wxNORMAL);
+  wxSMALL_FONT = new wxFont (sizeFont - 2, wxSWISS, wxNORMAL, wxNORMAL);
+  wxITALIC_FONT = new wxFont (sizeFont, wxROMAN, wxITALIC, wxNORMAL);
+  wxSWISS_FONT = new wxFont (sizeFont, wxSWISS, wxNORMAL, wxNORMAL);

 
   wxRED_PEN = new wxPen ("RED", 1, wxSOLID);
   wxCYAN_PEN = new wxPen ("CYAN", 1, wxSOLID);
 
   wxRED_PEN = new wxPen ("RED", 1, wxSOLID);
   wxCYAN_PEN = new wxPen ("CYAN", 1, wxSOLID);