Allow wxStaticText to have a custom fg without a custom bg

[wxWidgets.git] / include / wx / sizer.h

diff --git a/include/wx/sizer.h b/include/wx/sizer.h
index 35d020ad88285f5c6b6dd769155b357b413c0b5b..78581ba30c56488220a995c7238a9ad83a89f5c6 100644 (file)
--- a/include/wx/sizer.h
+++ b/include/wx/sizer.h
@@ -69,6 +69,8 @@ public:
     wxSizerFlags& Expand() { return Align(wxEXPAND); }
     wxSizerFlags& Centre() { return Align(wxCENTRE); }
     wxSizerFlags& Center() { return Centre(); }
+    wxSizerFlags& Left() { return Align(wxALIGN_LEFT); }
+    wxSizerFlags& Right() { return Align(wxALIGN_RIGHT); }
 
 
     wxSizerFlags& Border(int direction, int borderInPixels)
@@ -621,7 +623,8 @@ class WXDLLEXPORT wxStaticBox;
 class WXDLLEXPORT wxStaticBoxSizer: public wxBoxSizer
 {
 public:
-    wxStaticBoxSizer( wxStaticBox *box, int orient );
+    wxStaticBoxSizer(wxStaticBox *box, int orient);
+    wxStaticBoxSizer(int orient, wxWindow *win, const wxString& label = wxEmptyString);
 
     void RecalcSizes();
     wxSize CalcMin();
@@ -642,6 +645,8 @@ private:
 
 #endif // wxUSE_STATBOX
 
+#if wxUSE_BUTTON
+
 class WXDLLEXPORT wxStdDialogButtonSizer: public wxBoxSizer
 {
 public:
@@ -666,8 +671,8 @@ public:
     // is set to _("Save") and m_buttonNegative is set to _("Don't Save")
     // I wouldn't add any other hacks like that into here,
     // but this one I can see being useful.
-    void Finalise();
-    
+    void Realize();
+
     wxButton *GetAffirmativeButton() const { return m_buttonAffirmative; }
     wxButton *GetApplyButton() const { return m_buttonApply; }
     wxButton *GetNegativeButton() const { return m_buttonNegative; }
@@ -680,12 +685,14 @@ protected:
     wxButton *m_buttonNegative;     // wxID_NO
     wxButton *m_buttonCancel;
     wxButton *m_buttonHelp;
-    
+
 private:
     DECLARE_CLASS(wxStdDialogButtonSizer)
     DECLARE_NO_COPY_CLASS(wxStdDialogButtonSizer)
 };
 
+#endif // wxUSE_BUTTON
+
 #if WXWIN_COMPATIBILITY_2_4
 // NB: wxBookCtrlSizer and wxNotebookSizer are deprecated, they
 //     don't do anything. wxBookCtrlBase::DoGetBestSize does the job now.