Small fixes to allow compilation in Unicode mode with gcc

[wxWidgets.git] / utils / configtool / src / utils.h

diff --git a/utils/configtool/src/utils.h b/utils/configtool/src/utils.h
index 1fbc6866ef4cca4d22d50fe92b70d6992270b513..8b1dffa869611e75c0896d5d2e44542eb74d9bc9 100644 (file)
--- a/utils/configtool/src/utils.h
+++ b/utils/configtool/src/utils.h
@@ -14,10 +14,6 @@
  * \brief A file of utility functions and classes.
  */
 
  * \brief A file of utility functions and classes.
  */
 

-#ifdef __GNUG__
-// #pragma interface
-#endif
-

 #ifndef _AP_UTILS_H_
 #define _AP_UTILS_H_
 
 #ifndef _AP_UTILS_H_
 #define _AP_UTILS_H_
 


@@ -74,9 +70,6 @@ wxFont apStringToFont(const wxString& str);
 /// Get the index of the given named wxNotebook page
 int apFindNotebookPage(wxNotebook* notebook, const wxString& name);
 
 /// Get the index of the given named wxNotebook page
 int apFindNotebookPage(wxNotebook* notebook, const wxString& name);
 

-/// View the given URL
-void apViewHTMLFile(const wxString& url);
-

 /// Returns the system temporary directory.
 wxString wxGetTempDir();
 
 /// Returns the system temporary directory.
 wxString wxGetTempDir();
 


@@ -139,7 +132,7 @@ class wxIconInfo: public wxObject
 {
 public:
     wxIconInfo(const wxString& name);
 {
 public:
     wxIconInfo(const wxString& name);

-    
+

     // How many states? (Each state
     //  has enabled/disabled state)
     // Max (say) 4 states, each with
     // How many states? (Each state
     //  has enabled/disabled state)
     // Max (say) 4 states, each with


@@ -151,7 +144,7 @@ public:
     void SetIconId(int state, bool enabled, int iconId);
 
     const wxString& GetName() const { return m_name; }
     void SetIconId(int state, bool enabled, int iconId);
 
     const wxString& GetName() const { return m_name; }

-    
+

 protected:
     int             m_maxStates;
     int             m_states[wxMAX_ICON_STATES * 2]; // Enabled/disabled
 protected:
     int             m_maxStates;
     int             m_states[wxMAX_ICON_STATES * 2]; // Enabled/disabled


@@ -167,9 +160,9 @@ class wxIconTable: public wxList
 {
 public:
     wxIconTable(wxImageList* imageList = NULL);
 {
 public:
     wxIconTable(wxImageList* imageList = NULL);

-    
+

     void AppendInfo(wxIconInfo* info);
     void AppendInfo(wxIconInfo* info);

-    
+

     // Easy way of initialising both the image list and the
     // info db. It will generate image ids itself while appending the icon.
     // 'state' is an integer from 0 up to the max allowed, representing a different
     // Easy way of initialising both the image list and the
     // info db. It will generate image ids itself while appending the icon.
     // 'state' is an integer from 0 up to the max allowed, representing a different


@@ -177,17 +170,17 @@ public:
     // A folder that can be open or closed would have two states.
     // Enabled/disabled is taken as a special case.
     bool AddInfo(const wxString& name, const wxIcon& icon, int state, bool enabled);
     // A folder that can be open or closed would have two states.
     // Enabled/disabled is taken as a special case.
     bool AddInfo(const wxString& name, const wxIcon& icon, int state, bool enabled);

-    
+

     wxIconInfo* FindInfo(const wxString& name) const;
     wxIconInfo* FindInfo(const wxString& name) const;

-    
+

     int GetIconId(const wxString& name, int state, bool enabled = true) const;
     bool SetIconId(const wxString& name, int state, bool enabled, int iconId) ;
     int GetIconId(const wxString& name, int state, bool enabled = true) const;
     bool SetIconId(const wxString& name, int state, bool enabled, int iconId) ;

-    
+

     void SetImageList(wxImageList* imageList) { m_imageList = imageList; }
     wxImageList* GetImageList() const { return m_imageList; }
     void SetImageList(wxImageList* imageList) { m_imageList = imageList; }
     wxImageList* GetImageList() const { return m_imageList; }

-    
+

 protected:
 protected:

-    wxImageList*    m_imageList;    
+    wxImageList*    m_imageList;

 };
 
 /// Useful insertion operators for wxOutputStream.
 };
 
 /// Useful insertion operators for wxOutputStream.