Missing headers.

[wxWidgets.git] / src / generic / colrdlgg.cpp

diff --git a/src/generic/colrdlgg.cpp b/src/generic/colrdlgg.cpp
index 6ac7e393d8c214a4840599921c2961714035b63e..17250ef7ad9f2b7c13e16a1743738e5a5f6f3971 100644 (file)
--- a/src/generic/colrdlgg.cpp
+++ b/src/generic/colrdlgg.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        generic/colrdlgg.cpp
+// Name:        src/generic/colrdlgg.cpp
 // Purpose:     Choice dialogs
 // Author:      Julian Smart
 // Modified by:
@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "colrdlgg.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -32,16 +28,13 @@
     #include "wx/layout.h"
     #include "wx/dcclient.h"
     #include "wx/sizer.h"
+    #include "wx/slider.h"
 #endif
 
 #if wxUSE_STATLINE
     #include "wx/statline.h"
 #endif
 
-#if wxUSE_SLIDER
-    #include "wx/slider.h"
-#endif
-
 #include "wx/generic/colrdlgg.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxGenericColourDialog, wxDialog)
@@ -124,17 +117,17 @@ static const wxChar *wxColourDialogNames[] =
 
 wxGenericColourDialog::wxGenericColourDialog()
 {
-  dialogParent = NULL;
-  whichKind = 1;
-  colourSelection = -1;
+    dialogParent = NULL;
+    whichKind = 1;
+    colourSelection = -1;
 }
 
 wxGenericColourDialog::wxGenericColourDialog(wxWindow *parent,
                                              wxColourData *data)
 {
-  whichKind = 1;
-  colourSelection = -1;
-  Create(parent, data);
+    whichKind = 1;
+    colourSelection = -1;
+    Create(parent, data);
 }
 
 wxGenericColourDialog::~wxGenericColourDialog()
@@ -143,7 +136,7 @@ wxGenericColourDialog::~wxGenericColourDialog()
 
 void wxGenericColourDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
 {
-  EndModal(wxID_CANCEL);
+    EndModal(wxID_CANCEL);
 }
 
 bool wxGenericColourDialog::Create(wxWindow *parent, wxColourData *data)
@@ -166,7 +159,7 @@ bool wxGenericColourDialog::Create(wxWindow *parent, wxColourData *data)
 
 int wxGenericColourDialog::ShowModal()
 {
-  return wxDialog::ShowModal();
+    return wxDialog::ShowModal();
 }
 
 
@@ -226,36 +219,36 @@ void wxGenericColourDialog::OnPaint(wxPaintEvent& event)
 
 void wxGenericColourDialog::CalculateMeasurements()
 {
-  smallRectangleSize.x = 18;
-  smallRectangleSize.y = 14;
-  customRectangleSize.x = 40;
-  customRectangleSize.y = 40;
+    smallRectangleSize.x = 18;
+    smallRectangleSize.y = 14;
+    customRectangleSize.x = 40;
+    customRectangleSize.y = 40;
 
-  gridSpacing = 6;
-  sectionSpacing = 15;
+    gridSpacing = 6;
+    sectionSpacing = 15;
 
-  standardColoursRect.x = 10;
+    standardColoursRect.x = 10;
 #ifdef __WXPM__
-  standardColoursRect.y = 15 + 20; /* OS/2 needs to account for dialog titlebar */
+    standardColoursRect.y = 15 + 20; /* OS/2 needs to account for dialog titlebar */
 #else
-  standardColoursRect.y = 15;
+    standardColoursRect.y = 15;
 #endif
-  standardColoursRect.width = (8*smallRectangleSize.x) + (7*gridSpacing);
-  standardColoursRect.height = (6*smallRectangleSize.y) + (5*gridSpacing);
-
-  customColoursRect.x = standardColoursRect.x;
-  customColoursRect.y = standardColoursRect.y + standardColoursRect.height  + 20;
-  customColoursRect.width = (8*smallRectangleSize.x) + (7*gridSpacing);
-  customColoursRect.height = (2*smallRectangleSize.y) + (1*gridSpacing);
-
-  singleCustomColourRect.x = customColoursRect.width + customColoursRect.x + sectionSpacing;
-  singleCustomColourRect.y = 80;
-  singleCustomColourRect.width = customRectangleSize.x;
-  singleCustomColourRect.height = customRectangleSize.y;
-
-  okButtonX = 10;
-  customButtonX = singleCustomColourRect.x ;
-  buttonY = customColoursRect.y + customColoursRect.height + 10;
+    standardColoursRect.width = (8*smallRectangleSize.x) + (7*gridSpacing);
+    standardColoursRect.height = (6*smallRectangleSize.y) + (5*gridSpacing);
+
+    customColoursRect.x = standardColoursRect.x;
+    customColoursRect.y = standardColoursRect.y + standardColoursRect.height  + 20;
+    customColoursRect.width = (8*smallRectangleSize.x) + (7*gridSpacing);
+    customColoursRect.height = (2*smallRectangleSize.y) + (1*gridSpacing);
+
+    singleCustomColourRect.x = customColoursRect.width + customColoursRect.x + sectionSpacing;
+    singleCustomColourRect.y = 80;
+    singleCustomColourRect.width = customRectangleSize.x;
+    singleCustomColourRect.height = customRectangleSize.y;
+
+    okButtonX = 10;
+    customButtonX = singleCustomColourRect.x ;
+    buttonY = customColoursRect.y + customColoursRect.height + 10;
 }
 
 void wxGenericColourDialog::CreateWidgets()
@@ -371,33 +364,28 @@ void wxGenericColourDialog::InitializeColours(void)
 
 void wxGenericColourDialog::PaintBasicColours(wxDC& dc)
 {
-  dc.BeginDrawing();
-
-  int i;
-  for (i = 0; i < 6; i++)
-  {
-    int j;
-    for (j = 0; j < 8; j++)
+    int i;
+    for (i = 0; i < 6; i++)
     {
-      int ptr = i*8 + j;
+        int j;
+        for (j = 0; j < 8; j++)
+        {
+            int ptr = i*8 + j;
 
-      int x = (j*(smallRectangleSize.x+gridSpacing) + standardColoursRect.x);
-      int y = (i*(smallRectangleSize.y+gridSpacing) + standardColoursRect.y);
+            int x = (j*(smallRectangleSize.x+gridSpacing) + standardColoursRect.x);
+            int y = (i*(smallRectangleSize.y+gridSpacing) + standardColoursRect.y);
 
-      dc.SetPen(*wxBLACK_PEN);
-      wxBrush brush(standardColours[ptr], wxSOLID);
-      dc.SetBrush(brush);
+            dc.SetPen(*wxBLACK_PEN);
+            wxBrush brush(standardColours[ptr], wxSOLID);
+            dc.SetBrush(brush);
 
-      dc.DrawRectangle( x, y, smallRectangleSize.x, smallRectangleSize.y);
+            dc.DrawRectangle( x, y, smallRectangleSize.x, smallRectangleSize.y);
+        }
     }
-  }
-  dc.EndDrawing();
 }
 
 void wxGenericColourDialog::PaintCustomColours(wxDC& dc)
 {
-  dc.BeginDrawing();
-
   int i;
   for (i = 0; i < 2; i++)
   {
@@ -417,7 +405,6 @@ void wxGenericColourDialog::PaintCustomColours(wxDC& dc)
       dc.DrawRectangle( x, y, smallRectangleSize.x, smallRectangleSize.y);
     }
   }
-  dc.EndDrawing();
 }
 
 void wxGenericColourDialog::PaintHighlight(wxDC& dc, bool draw)
@@ -425,8 +412,6 @@ void wxGenericColourDialog::PaintHighlight(wxDC& dc, bool draw)
   if ( colourSelection < 0 )
       return;
 
-  dc.BeginDrawing();
-
   // Number of pixels bigger than the standard rectangle size
   // for drawing a highlight
   int deltaX = 2;
@@ -466,26 +451,20 @@ void wxGenericColourDialog::PaintHighlight(wxDC& dc, bool draw)
     dc.SetBrush(*wxTRANSPARENT_BRUSH);
     dc.DrawRectangle( x, y, (smallRectangleSize.x + (2*deltaX)), (smallRectangleSize.y + (2*deltaY)));
   }
-
-  dc.EndDrawing();
 }
 
 void wxGenericColourDialog::PaintCustomColour(wxDC& dc)
 {
-  dc.BeginDrawing();
-
-  dc.SetPen(*wxBLACK_PEN);
-
-  wxBrush *brush = new wxBrush(colourData.m_dataColour, wxSOLID);
-  dc.SetBrush(*brush);
+    dc.SetPen(*wxBLACK_PEN);
 
-  dc.DrawRectangle( singleCustomColourRect.x, singleCustomColourRect.y,
-                    customRectangleSize.x, customRectangleSize.y);
+    wxBrush *brush = new wxBrush(colourData.m_dataColour, wxSOLID);
+    dc.SetBrush(*brush);
 
-  dc.SetBrush(wxNullBrush);
-  delete brush;
+    dc.DrawRectangle( singleCustomColourRect.x, singleCustomColourRect.y,
+                      customRectangleSize.x, customRectangleSize.y);
 
-  dc.EndDrawing();
+    dc.SetBrush(wxNullBrush);
+    delete brush;
 }
 
 void wxGenericColourDialog::OnBasicColourClick(int which)