wxListCtrl::InsertItem() returned wrong index.

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

diff --git a/src/generic/colrdlgg.cpp b/src/generic/colrdlgg.cpp
index 9080ef2b0214ee8c1e0d02f2b38cd94813e9a7b2..d452a8373a14ce873f1f7e24254916ebee8c9975 100644 (file)
--- a/src/generic/colrdlgg.cpp
+++ b/src/generic/colrdlgg.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem

-// Licence:    wxWindows license
+// Licence:     wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -32,124 +32,132 @@
 #include "wx/layout.h"
 #include "wx/dcclient.h"
 #include "wx/slider.h"
 #include "wx/layout.h"
 #include "wx/dcclient.h"
 #include "wx/slider.h"

+#include "wx/sizer.h"
+#endif
+
+#if wxUSE_STATLINE
+    #include "wx/statline.h"

 #endif
 
 #include "wx/generic/colrdlgg.h"
 
 #endif
 
 #include "wx/generic/colrdlgg.h"
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxGenericColourDialog, wxDialog)
 
 BEGIN_EVENT_TABLE(wxGenericColourDialog, wxDialog)
 IMPLEMENT_DYNAMIC_CLASS(wxGenericColourDialog, wxDialog)
 
 BEGIN_EVENT_TABLE(wxGenericColourDialog, wxDialog)

-       EVT_BUTTON(wxID_ADD_CUSTOM, wxGenericColourDialog::OnAddCustom)
-       EVT_SLIDER(wxID_RED_SLIDER, wxGenericColourDialog::OnRedSlider)
-       EVT_SLIDER(wxID_GREEN_SLIDER, wxGenericColourDialog::OnGreenSlider)
-       EVT_SLIDER(wxID_BLUE_SLIDER, wxGenericColourDialog::OnBlueSlider)
-       EVT_PAINT(wxGenericColourDialog::OnPaint)
-       EVT_MOUSE_EVENTS(wxGenericColourDialog::OnMouseEvent)
+    EVT_BUTTON(wxID_ADD_CUSTOM, wxGenericColourDialog::OnAddCustom)
+    EVT_SLIDER(wxID_RED_SLIDER, wxGenericColourDialog::OnRedSlider)
+    EVT_SLIDER(wxID_GREEN_SLIDER, wxGenericColourDialog::OnGreenSlider)
+    EVT_SLIDER(wxID_BLUE_SLIDER, wxGenericColourDialog::OnBlueSlider)
+    EVT_PAINT(wxGenericColourDialog::OnPaint)
+    EVT_MOUSE_EVENTS(wxGenericColourDialog::OnMouseEvent)
+    EVT_CLOSE(wxGenericColourDialog::OnCloseWindow)

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

-#endif

 
 /*
  * Generic wxColourDialog
  */
 
 #define NUM_COLS 48
 
 /*
  * Generic wxColourDialog
  */
 
 #define NUM_COLS 48

-static wxString wxColourDialogNames[NUM_COLS]={"ORANGE",
-                                   "GOLDENROD",
-                                   "WHEAT",
-                                   "SPRING GREEN",
-                                   "SKY BLUE",
-                                   "SLATE BLUE",
-                                   "MEDIUM VIOLET RED",
-                                   "PURPLE",
-
-                                   "RED",
-                                   "YELLOW",
-                                   "MEDIUM SPRING GREEN",
-                                   "PALE GREEN",
-                                   "CYAN",
-                                   "LIGHT STEEL BLUE",
-                                   "ORCHID",
-                                   "LIGHT MAGENTA",
-                                   
-                                   "BROWN",
-                                   "YELLOW",
-                                   "GREEN",
-                                   "CADET BLUE",
-                                   "MEDIUM BLUE",
-                                   "MAGENTA",
-                                   "MAROON",
-                                   "ORANGE RED",
-
-                                   "FIREBRICK",
-                                   "CORAL",
-                                   "FOREST GREEN",
-                                   "AQUARAMINE",
-                                   "BLUE",
-                                   "NAVY",
-                                   "THISTLE",
-                                   "MEDIUM VIOLET RED",
-                                   
-                                   "INDIAN RED",
-                                   "GOLD",
-                                   "MEDIUM SEA GREEN",
-                                   "MEDIUM BLUE",
-                                   "MIDNIGHT BLUE",
-                                   "GREY",
-                                   "PURPLE",
-                                   "KHAKI",
-                                   
-                                   "BLACK",
-                                   "MEDIUM FOREST GREEN",
-                                   "KHAKI",
-                                   "DARK GREY",
-                                   "SEA GREEN",
-                                   "LIGHT GREY",
-                                   "MEDIUM SLATE BLUE",
-                                   "WHITE"
-                                   };
-
-wxGenericColourDialog::wxGenericColourDialog(void)
+static wxString wxColourDialogNames[NUM_COLS]={wxT("ORANGE"),
+            wxT("GOLDENROD"),
+            wxT("WHEAT"),
+            wxT("SPRING GREEN"),
+            wxT("SKY BLUE"),
+            wxT("SLATE BLUE"),
+            wxT("MEDIUM VIOLET RED"),
+            wxT("PURPLE"),
+
+            wxT("RED"),
+            wxT("YELLOW"),
+            wxT("MEDIUM SPRING GREEN"),
+            wxT("PALE GREEN"),
+            wxT("CYAN"),
+            wxT("LIGHT STEEL BLUE"),
+            wxT("ORCHID"),
+            wxT("LIGHT MAGENTA"),
+
+            wxT("BROWN"),
+            wxT("YELLOW"),
+            wxT("GREEN"),
+            wxT("CADET BLUE"),
+            wxT("MEDIUM BLUE"),
+            wxT("MAGENTA"),
+            wxT("MAROON"),
+            wxT("ORANGE RED"),
+
+            wxT("FIREBRICK"),
+            wxT("CORAL"),
+            wxT("FOREST GREEN"),
+            wxT("AQUAMARINE"),
+            wxT("BLUE"),
+            wxT("NAVY"),
+            wxT("THISTLE"),
+            wxT("MEDIUM VIOLET RED"),
+
+            wxT("INDIAN RED"),
+            wxT("GOLD"),
+            wxT("MEDIUM SEA GREEN"),
+            wxT("MEDIUM BLUE"),
+            wxT("MIDNIGHT BLUE"),
+            wxT("GREY"),
+            wxT("PURPLE"),
+            wxT("KHAKI"),
+
+            wxT("BLACK"),
+            wxT("MEDIUM FOREST GREEN"),
+            wxT("KHAKI"),
+            wxT("DARK GREY"),
+            wxT("SEA GREEN"),
+            wxT("LIGHT GREY"),
+            wxT("MEDIUM SLATE BLUE"),
+            wxT("WHITE")
+            };
+
+wxGenericColourDialog::wxGenericColourDialog()

 {
   dialogParent = NULL;
   whichKind = 1;
   colourSelection = 0;
 }
 
 {
   dialogParent = NULL;
   whichKind = 1;
   colourSelection = 0;
 }
 

-wxGenericColourDialog::wxGenericColourDialog(wxWindow *parent, wxColourData *data):
-  wxDialog(parent, -1, "Colour", wxPoint(0, 0), wxSize(900, 900), wxDEFAULT_DIALOG_STYLE|wxDIALOG_MODAL)
+wxGenericColourDialog::wxGenericColourDialog(wxWindow *parent,
+                                             wxColourData *data)

 {
   whichKind = 1;
   colourSelection = 0;
   Create(parent, data);
 }
 
 {
   whichKind = 1;
   colourSelection = 0;
   Create(parent, data);
 }
 

-wxGenericColourDialog::~wxGenericColourDialog(void)
+wxGenericColourDialog::~wxGenericColourDialog()

 {
 }
 
 {
 }
 

-bool wxGenericColourDialog::OnClose(void)
+void wxGenericColourDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))

 {
 {

-  Show(FALSE);
-  return FALSE;
+  EndModal(wxID_CANCEL);

 }
 
 bool wxGenericColourDialog::Create(wxWindow *parent, wxColourData *data)
 {
 }
 
 bool wxGenericColourDialog::Create(wxWindow *parent, wxColourData *data)
 {

-  dialogParent = parent;
-  
-  if (data)
-    colourData = *data;
-
-  InitializeColours();
-  CalculateMeasurements();
-  CreateWidgets();
-  
-  return TRUE;
+    if ( !wxDialog::Create(parent, -1, wxT("Colour"),
+                           wxPoint(0, 0), wxSize(900, 900),
+                           wxDEFAULT_DIALOG_STYLE | wxDIALOG_MODAL) )
+        return FALSE;
+
+    dialogParent = parent;
+
+    if (data)
+        colourData = *data;
+
+    InitializeColours();
+    CalculateMeasurements();
+    CreateWidgets();
+
+    return TRUE;

 }
 
 }
 

-int wxGenericColourDialog::ShowModal(void)
+int wxGenericColourDialog::ShowModal()

 {
   return wxDialog::ShowModal();
 }
 {
   return wxDialog::ShowModal();
 }


@@ -184,7 +192,9 @@ void wxGenericColourDialog::OnMouseEvent(wxMouseEvent& event)
 
 void wxGenericColourDialog::OnPaint(wxPaintEvent& event)
 {
 
 void wxGenericColourDialog::OnPaint(wxPaintEvent& event)
 {

+#if !defined(__WXMOTIF__) && !defined(__WXMAC__)

   wxDialog::OnPaint(event);
   wxDialog::OnPaint(event);

+#endif

 
   wxPaintDC dc(this);
 
 
   wxPaintDC dc(this);
 


@@ -194,7 +204,7 @@ void wxGenericColourDialog::OnPaint(wxPaintEvent& event)
   PaintHighlight(dc, TRUE);
 }
 
   PaintHighlight(dc, TRUE);
 }
 

-void wxGenericColourDialog::CalculateMeasurements(void)
+void wxGenericColourDialog::CalculateMeasurements()

 {
   smallRectangleSize.x = 18;
   smallRectangleSize.y = 14;
 {
   smallRectangleSize.x = 18;
   smallRectangleSize.y = 14;


@@ -224,40 +234,50 @@ void wxGenericColourDialog::CalculateMeasurements(void)
   buttonY = customColoursRect.y + customColoursRect.height + 10;
 }
 
   buttonY = customColoursRect.y + customColoursRect.height + 10;
 }
 

-void wxGenericColourDialog::CreateWidgets(void)
+void wxGenericColourDialog::CreateWidgets()

 {
 {

-  wxBeginBusyCursor();
-  
-  wxButton *okButton = new wxButton(this, wxID_OK, "OK", wxPoint(okButtonX, buttonY));
-  int bw, bh;
-  okButton->GetSize(&bw, &bh);
-
-  (void) new wxButton(this, wxID_CANCEL, "Cancel", wxPoint(okButtonX + bw + 10, buttonY));
-  (void) new wxButton(this, wxID_ADD_CUSTOM, "Add to custom colours",
-     wxPoint(customButtonX, buttonY));
-
-  int sliderX = singleCustomColourRect.x + singleCustomColourRect.width + sectionSpacing;
-#ifdef __X__
-  int sliderSpacing = 75;
-  int sliderHeight = 160;
+    wxBeginBusyCursor();
+
+    int sliderX = singleCustomColourRect.x + singleCustomColourRect.width + sectionSpacing;
+#if defined(__WXMOTIF__)
+    int sliderSpacing = 65;
+    int sliderHeight = 160;

 #else
 #else

-  int sliderSpacing = 45;
-  int sliderHeight = 160;
+    int sliderSpacing = 45;
+    int sliderHeight = 160;
+#endif
+
+    redSlider = new wxSlider(this, wxID_RED_SLIDER, 0, 0, 255,
+        wxPoint(sliderX, 10), wxSize(-1, sliderHeight), wxVERTICAL|wxSL_LABELS);
+    greenSlider = new wxSlider(this, wxID_GREEN_SLIDER, 0, 0, 255,
+        wxPoint(sliderX + sliderSpacing, 10), wxSize(-1, sliderHeight), wxVERTICAL|wxSL_LABELS);
+    blueSlider = new wxSlider(this, wxID_BLUE_SLIDER, 0, 0, 255,
+        wxPoint(sliderX + 2*sliderSpacing, 10), wxSize(-1, sliderHeight), wxVERTICAL|wxSL_LABELS);
+
+    wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
+
+    // 1) space for explicitly layouted controls
+    topsizer->Add( sliderX + 3*sliderSpacing, sliderHeight+25 );
+    
+#if wxUSE_STATLINE
+    // 2) static line
+    topsizer->Add( new wxStaticLine( this, -1 ), 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10 );

 #endif
 #endif

-  
-  redSlider = new wxSlider(this, wxID_RED_SLIDER, 0, 0, 255,
-   wxPoint(sliderX, 10), wxSize(-1, sliderHeight), wxVERTICAL|wxSL_LABELS);
-  greenSlider = new wxSlider(this, wxID_GREEN_SLIDER, 0, 0, 255,
-   wxPoint(sliderX + sliderSpacing, 10), wxSize(-1, sliderHeight), wxVERTICAL|wxSL_LABELS);
-  blueSlider = new wxSlider(this, wxID_BLUE_SLIDER, 0, 0, 255,
-   wxPoint(sliderX + 2*sliderSpacing, 10), wxSize(-1, sliderHeight), wxVERTICAL|wxSL_LABELS);

 
 

-  SetClientSize(sliderX + 3*sliderSpacing, buttonY + 30);
-  okButton->SetDefault();
+    // 3) buttons
+    wxSizer *buttonsizer = CreateButtonSizer( wxOK|wxCANCEL );
+    buttonsizer->Add( new wxButton(this, wxID_ADD_CUSTOM, _("Add to custom colours") ), 0, wxLEFT|wxRIGHT, 10 );
+    topsizer->Add( buttonsizer, 0, wxCENTRE | wxALL, 10 );
+
+    SetAutoLayout( TRUE );
+    SetSizer( topsizer );
+    
+    topsizer->SetSizeHints( this );
+    topsizer->Fit( this );

 
 

-  Centre(wxBOTH);
+    Centre( wxBOTH );

 
 

-  wxEndBusyCursor();
+    wxEndBusyCursor();

 }
 
 void wxGenericColourDialog::InitializeColours(void)
 }
 
 void wxGenericColourDialog::InitializeColours(void)


@@ -274,11 +294,6 @@ void wxGenericColourDialog::InitializeColours(void)
 
   for (i = 0; i < 16; i++)
     customColours[i] =
 
   for (i = 0; i < 16; i++)
     customColours[i] =

-/*
-#ifndef __VMS__
-     (wxColour&)
-#endif
-*/

        colourData.GetCustomColour(i);
 
   singleCustomColour.Set(0, 0, 0);
        colourData.GetCustomColour(i);
 
   singleCustomColour.Set(0, 0, 0);


@@ -295,7 +310,7 @@ void wxGenericColourDialog::PaintBasicColours(wxDC& dc)
     for (j = 0; j < 8; j++)
     {
       int ptr = i*8 + 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);
 


@@ -320,7 +335,7 @@ void wxGenericColourDialog::PaintCustomColours(wxDC& dc)
     for (j = 0; j < 8; j++)
     {
       int ptr = i*8 + j;
     for (j = 0; j < 8; j++)
     {
       int ptr = i*8 + j;

-      
+

       int x = (j*(smallRectangleSize.x+gridSpacing)) + customColoursRect.x;
       int y = (i*(smallRectangleSize.y+gridSpacing)) + customColoursRect.y;
 
       int x = (j*(smallRectangleSize.x+gridSpacing)) + customColoursRect.x;
       int y = (i*(smallRectangleSize.y+gridSpacing)) + customColoursRect.y;
 


@@ -374,18 +389,18 @@ void wxGenericColourDialog::PaintHighlight(wxDC& dc, bool draw)
       dc.SetPen(*wxBLACK_PEN);
     else
       dc.SetPen(*wxLIGHT_GREY_PEN);
       dc.SetPen(*wxBLACK_PEN);
     else
       dc.SetPen(*wxLIGHT_GREY_PEN);

-      
+

     dc.SetBrush(*wxTRANSPARENT_BRUSH);
     dc.DrawRectangle( x, y, (smallRectangleSize.x + (2*deltaX)), (smallRectangleSize.y + (2*deltaY)));
   }
     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.EndDrawing();
 }
 
 void wxGenericColourDialog::PaintCustomColour(wxDC& dc)
 {
   dc.BeginDrawing();

-  
+

   dc.SetPen(*wxBLACK_PEN);
 
   wxBrush *brush = new wxBrush(singleCustomColour, wxSOLID);
   dc.SetPen(*wxBLACK_PEN);
 
   wxBrush *brush = new wxBrush(singleCustomColour, wxSOLID);


@@ -450,7 +465,7 @@ void wxGenericColourDialog::OnAddCustom(wxCommandEvent& WXUNUSED(event))
   customColours[colourSelection].Set(singleCustomColour.Red(), singleCustomColour.Green(), singleCustomColour.Blue());
   colourData.SetColour(customColours[colourSelection]);
   colourData.SetCustomColour(colourSelection, customColours[colourSelection]);
   customColours[colourSelection].Set(singleCustomColour.Red(), singleCustomColour.Green(), singleCustomColour.Blue());
   colourData.SetColour(customColours[colourSelection]);
   colourData.SetCustomColour(colourSelection, customColours[colourSelection]);

-  
+

   PaintCustomColours(dc);
 }
 
   PaintCustomColours(dc);
 }
 


@@ -458,7 +473,7 @@ void wxGenericColourDialog::OnRedSlider(wxCommandEvent& WXUNUSED(event))
 {
   if (!redSlider)
     return;
 {
   if (!redSlider)
     return;

-    
+

   wxClientDC dc(this);
   singleCustomColour.Set(redSlider->GetValue(), singleCustomColour.Green(), singleCustomColour.Blue());
   PaintCustomColour(dc);
   wxClientDC dc(this);
   singleCustomColour.Set(redSlider->GetValue(), singleCustomColour.Green(), singleCustomColour.Blue());
   PaintCustomColour(dc);