using scan-line polygon conversion for constructing wxregion

[wxWidgets.git] / utils / screenshotgen / src / customcombo.h

diff --git a/utils/screenshotgen/src/customcombo.h b/utils/screenshotgen/src/customcombo.h
index e438060e9b4708454b615b15e105643431d5a959..48ff63d5e005b7b5e01c93645854cfc8d00f5978 100644 (file)
--- a/utils/screenshotgen/src/customcombo.h
+++ b/utils/screenshotgen/src/customcombo.h
@@ -3,20 +3,20 @@
 // Purpose:     Define some custom wxComboCtrls
 // Author:      Utensil Candel (UtensilCandel@@gmail.com)
 // RCS-ID:      $Id$
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef WX_CUSTOM_COMBO_H
 #define WX_CUSTOM_COMBO_H
 
 // ----------------------------------------------------------------------------
-// class wxPenStyleComboBox
+// class PenStyleComboBox
 // This class is a modified version of the one from samples/combo.cpp
 // ----------------------------------------------------------------------------
 
 #include <wx/odcombo.h>
 
-class wxPenStyleComboBox : public wxOwnerDrawnComboBox
+class PenStyleComboBox : public wxOwnerDrawnComboBox
 {
 public:
     virtual void OnDrawItem( wxDC& dc,
@@ -32,7 +32,7 @@ public:
 
     virtual wxCoord OnMeasureItemWidth( size_t WXUNUSED(item) ) const;
 
-    static wxPenStyleComboBox* CreateSample(wxWindow* parent);
+    static PenStyleComboBox* CreateSample(wxWindow* parent);
 };
 
 
@@ -60,7 +60,8 @@ public:
                                   wxLC_LIST|wxLC_VRULES|wxBORDER_THEME);
     }
 
-    virtual wxWindow *GetControl() { return this; }
+    virtual wxWindow *GetControl()
+        { return this; }
 
     virtual void SetStringValue( const wxString& s )
     {
@@ -113,8 +114,8 @@ public:
     }
 
 protected:
-    int             m_value; // current item index
-    int             m_itemHere; // hot item in popup
+    int             m_value;        // current item index
+    int             m_itemHere;     // hot item in popup
 
 private:
     DECLARE_EVENT_TABLE()
@@ -158,7 +159,8 @@ public:
         return wxSize(minWidth, wxMin(80, maxHeight));
     }
 
-    virtual wxWindow *GetControl() { return this; }
+    virtual wxWindow *GetControl()
+        { return this; }
 
     // Needed by SetStringValue
     wxTreeItemId FindItemByText( wxTreeItemId parent, const wxString& text )
@@ -236,9 +238,8 @@ public:
     }
 
 protected:
-
-    wxTreeItemId        m_value; // current item index
-    wxTreeItemId        m_itemHere; // hot item in popup
+    wxTreeItemId        m_value;        // current item index
+    wxTreeItemId        m_itemHere;     // hot item in popup
 
 private:
     DECLARE_EVENT_TABLE()