X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b73e73f912a51b8be582b8bc987bb47fb5fc543a..3b49331b7441e091fc5997b830801d76a1243f28:/include/wx/generic/colrdlgg.h diff --git a/include/wx/generic/colrdlgg.h b/include/wx/generic/colrdlgg.h index 06feb75ffa..0d59436e90 100644 --- a/include/wx/generic/colrdlgg.h +++ b/include/wx/generic/colrdlgg.h @@ -25,7 +25,7 @@ #define wxID_GREEN_SLIDER 3002 #define wxID_BLUE_SLIDER 3003 - class WXDLLEXPORT wxSlider; + class WXDLLIMPEXP_FWD_CORE wxSlider; #endif // wxUSE_SLIDER @@ -39,7 +39,7 @@ public: bool Create(wxWindow *parent, wxColourData *data = (wxColourData *) NULL); - wxColourData &GetColourData() { return colourData; } + wxColourData &GetColourData() { return m_colourData; } virtual int ShowModal(); @@ -70,46 +70,45 @@ public: void OnCloseWindow(wxCloseEvent& event); protected: - wxColourData colourData; - wxWindow *dialogParent; + wxColourData m_colourData; // Area reserved for grids of colours - wxRect standardColoursRect; - wxRect customColoursRect; - wxRect singleCustomColourRect; + wxRect m_standardColoursRect; + wxRect m_customColoursRect; + wxRect m_singleCustomColourRect; // Size of each colour rectangle - wxPoint smallRectangleSize; + wxPoint m_smallRectangleSize; // For single customizable colour - wxPoint customRectangleSize; + wxPoint m_customRectangleSize; // Grid spacing (between rectangles) - int gridSpacing; + int m_gridSpacing; // Section spacing (between left and right halves of dialog box) - int sectionSpacing; + int m_sectionSpacing; // 48 'standard' colours - wxColour standardColours[48]; + wxColour m_standardColours[48]; // 16 'custom' colours - wxColour customColours[16]; + wxColour m_customColours[16]; // Which colour is selected? An index into one of the two areas. - int colourSelection; - int whichKind; // 1 for standard colours, 2 for custom colours, + int m_colourSelection; + int m_whichKind; // 1 for standard colours, 2 for custom colours, #if wxUSE_SLIDER - wxSlider *redSlider; - wxSlider *greenSlider; - wxSlider *blueSlider; + wxSlider *m_redSlider; + wxSlider *m_greenSlider; + wxSlider *m_blueSlider; #endif // wxUSE_SLIDER - int buttonY; + int m_buttonY; - int okButtonX; - int customButtonX; + int m_okButtonX; + int m_customButtonX; // static bool colourDialogCancelled;