Don't define __STRICT_ANSI__, we should build both with and without it.

[wxWidgets.git] / include / wx / aui / dockart.h

diff --git a/include/wx/aui/dockart.h b/include/wx/aui/dockart.h
index 027f399644ff6d291ae7862e33d80c41076ea054..744cad56c4e5e3b7d0d7000f215b1b56b5330b33 100644 (file)
--- a/include/wx/aui/dockart.h
+++ b/include/wx/aui/dockart.h
@@ -4,7 +4,6 @@
 // Author:      Benjamin I. Williams
 // Modified by:
 // Created:     2005-05-17
 // Author:      Benjamin I. Williams
 // Modified by:
 // Created:     2005-05-17

-// RCS-ID:      $Id$

 // Copyright:   (C) Copyright 2005, Kirix Corporation, All Rights Reserved.
 // Licence:     wxWindows Library Licence, Version 3.1
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (C) Copyright 2005, Kirix Corporation, All Rights Reserved.
 // Licence:     wxWindows Library Licence, Version 3.1
 ///////////////////////////////////////////////////////////////////////////////


@@ -37,7 +36,7 @@ public:
     virtual ~wxAuiDockArt() { }
 
     virtual int GetMetric(int id) = 0;
     virtual ~wxAuiDockArt() { }
 
     virtual int GetMetric(int id) = 0;

-    virtual void SetMetric(int id, int new_val) = 0;
+    virtual void SetMetric(int id, int newVal) = 0;

     virtual void SetFont(int id, const wxFont& font) = 0;
     virtual wxFont GetFont(int id) = 0;
     virtual wxColour GetColour(int id) = 0;
     virtual void SetFont(int id, const wxFont& font) = 0;
     virtual wxFont GetFont(int id) = 0;
     virtual wxColour GetColour(int id) = 0;


@@ -74,7 +73,7 @@ public:
     virtual void DrawPaneButton(wxDC& dc,
                           wxWindow* window,
                           int button,
     virtual void DrawPaneButton(wxDC& dc,
                           wxWindow* window,
                           int button,

-                          int button_state,
+                          int buttonState,

                           const wxRect& rect,
                           wxAuiPaneInfo& pane) = 0;
 };
                           const wxRect& rect,
                           wxAuiPaneInfo& pane) = 0;
 };


@@ -90,8 +89,8 @@ public:
 
     wxAuiDefaultDockArt();
 
 
     wxAuiDefaultDockArt();
 

-    int GetMetric(int metric_id);
-    void SetMetric(int metric_id, int new_val);
+    int GetMetric(int metricId);
+    void SetMetric(int metricId, int newVal);

     wxColour GetColour(int id);
     void SetColour(int id, const wxColor& colour);
     void SetFont(int id, const wxFont& font);
     wxColour GetColour(int id);
     void SetColour(int id, const wxColor& colour);
     void SetFont(int id, const wxFont& font);


@@ -126,7 +125,7 @@ public:
     void DrawPaneButton(wxDC& dc,
                   wxWindow *window,
                   int button,
     void DrawPaneButton(wxDC& dc,
                   wxWindow *window,
                   int button,

-                  int button_state,
+                  int buttonState,

                   const wxRect& rect,
                   wxAuiPaneInfo& pane);
 
                   const wxRect& rect,
                   wxAuiPaneInfo& pane);
 


@@ -142,35 +141,35 @@ protected:
 
 protected:
 
 
 protected:
 

-    wxPen m_border_pen;
-    wxBrush m_sash_brush;
-    wxBrush m_background_brush;
-    wxBrush m_gripper_brush;
-    wxFont m_caption_font;
-    wxBitmap m_inactive_close_bitmap;
-    wxBitmap m_inactive_pin_bitmap;
-    wxBitmap m_inactive_maximize_bitmap;
-    wxBitmap m_inactive_restore_bitmap;
-    wxBitmap m_active_close_bitmap;
-    wxBitmap m_active_pin_bitmap;
-    wxBitmap m_active_maximize_bitmap;
-    wxBitmap m_active_restore_bitmap;
-    wxPen m_gripper_pen1;
-    wxPen m_gripper_pen2;
-    wxPen m_gripper_pen3;
-    wxColour m_base_colour;
-    wxColour m_active_caption_colour;
-    wxColour m_active_caption_gradient_colour;
-    wxColour m_active_caption_text_colour;
-    wxColour m_inactive_caption_colour;
-    wxColour m_inactive_caption_gradient_colour;
-    wxColour m_inactive_caption_text_colour;
-    int m_border_size;
-    int m_caption_size;
-    int m_sash_size;
-    int m_button_size;
-    int m_gripper_size;
-    int m_gradient_type;
+    wxPen m_borderPen;
+    wxBrush m_sashBrush;
+    wxBrush m_backgroundBrush;
+    wxBrush m_gripperBrush;
+    wxFont m_captionFont;
+    wxBitmap m_inactiveCloseBitmap;
+    wxBitmap m_inactivePinBitmap;
+    wxBitmap m_inactiveMaximizeBitmap;
+    wxBitmap m_inactiveRestoreBitmap;
+    wxBitmap m_activeCloseBitmap;
+    wxBitmap m_activePinBitmap;
+    wxBitmap m_activeMaximizeBitmap;
+    wxBitmap m_activeRestoreBitmap;
+    wxPen m_gripperPen1;
+    wxPen m_gripperPen2;
+    wxPen m_gripperPen3;
+    wxColour m_baseColour;
+    wxColour m_activeCaptionColour;
+    wxColour m_activeCaptionGradientColour;
+    wxColour m_activeCaptionTextColour;
+    wxColour m_inactiveCaptionColour;
+    wxColour m_inactiveCaptionGradientColour;
+    wxColour m_inactiveCaptionTextColour;
+    int m_borderSize;
+    int m_captionSize;
+    int m_sashSize;
+    int m_buttonSize;
+    int m_gripperSize;
+    int m_gradientType;

 };
 
 
 };