fixes for Sun CC 5.0 (unlike 4.2 it understands bool)

[wxWidgets.git] / include / wx / msw / listbox.h

diff --git a/include/wx/msw/listbox.h b/include/wx/msw/listbox.h
index 1b6f0001dfba616594b58753e91aa84548e8df09..f64c4741e2bc5d0b7fba025974c21af8e4fc4917 100644 (file)
--- a/include/wx/msw/listbox.h
+++ b/include/wx/msw/listbox.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:    wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __LISTBOXH__
-#define __LISTBOXH__
+#ifndef _WX_LISTBOX_H_
+#define _WX_LISTBOX_H_

 
 #ifdef __GNUG__
 #pragma interface "listbox.h"
 
 #ifdef __GNUG__
 #pragma interface "listbox.h"


@@ -18,15 +18,20 @@
 
 #include "wx/control.h"
 
 
 #include "wx/control.h"
 

-WXDLLEXPORT_DATA(extern const char*) wxListBoxNameStr;

 WXDLLEXPORT_DATA(extern const char*) wxListBoxNameStr;
 
 WXDLLEXPORT_DATA(extern const char*) wxListBoxNameStr;
 

-#if USE_OWNER_DRAWN
+#if wxUSE_OWNER_DRAWN

   class WXDLLEXPORT wxOwnerDrawn;
 
   // define the array of list box items
   #include  <wx/dynarray.h>
   class WXDLLEXPORT wxOwnerDrawn;
 
   // define the array of list box items
   #include  <wx/dynarray.h>

+
+  #undef WXDLLEXPORTLOCAL
+  #define WXDLLEXPORTLOCAL WXDLLEXPORT

   WX_DEFINE_ARRAY(wxOwnerDrawn *, wxListBoxItemsArray);
   WX_DEFINE_ARRAY(wxOwnerDrawn *, wxListBoxItemsArray);

+  #undef  WXDLLEXPORTLOCAL
+  #define WXDLLEXPORTLOCAL
+

 #endif
 
 // forward decl for GetSelections()
 #endif
 
 // forward decl for GetSelections()


@@ -41,71 +46,74 @@ class WXDLLEXPORT wxListBox: public wxControl
  public:
 
   wxListBox(void);
  public:
 
   wxListBox(void);

-  inline wxListBox(wxWindow *parent, const wxWindowID id,
+  inline wxListBox(wxWindow *parent, wxWindowID id,

            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,

-           const int n = 0, const wxString choices[] = NULL,
-           const long style = 0,
+           int n = 0, const wxString choices[] = NULL,
+           long style = 0,

            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxListBoxNameStr)
   {
     Create(parent, id, pos, size, n, choices, style, validator, name);
   }
 
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxListBoxNameStr)
   {
     Create(parent, id, pos, size, n, choices, style, validator, name);
   }
 

-  bool Create(wxWindow *parent, const wxWindowID id,
+  bool Create(wxWindow *parent, wxWindowID id,

            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,

-           const int n = 0, const wxString choices[] = NULL,
-           const long style = 0,
+           int n = 0, const wxString choices[] = NULL,
+           long style = 0,

            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxListBoxNameStr);
 
   ~wxListBox();
 
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxListBoxNameStr);
 
   ~wxListBox();
 

-  bool MSWCommand(const WXUINT param, const WXWORD id);
+  bool MSWCommand(WXUINT param, WXWORD id);

 
 

-#if USE_OWNER_DRAWN
+#if wxUSE_OWNER_DRAWN

   bool MSWOnMeasure(WXMEASUREITEMSTRUCT *item);
   bool MSWOnDraw(WXDRAWITEMSTRUCT *item);
 
   // plug-in for derived classes
   bool MSWOnMeasure(WXMEASUREITEMSTRUCT *item);
   bool MSWOnDraw(WXDRAWITEMSTRUCT *item);
 
   // plug-in for derived classes

-  virtual wxOwnerDrawn *CreateItem(uint n);
+  virtual wxOwnerDrawn *CreateItem(size_t n);

 
   // allows to get the item and use SetXXX functions to set it's appearance
 
   // allows to get the item and use SetXXX functions to set it's appearance

-  wxOwnerDrawn *GetItem(uint n) const { return m_aItems[n]; }
+  wxOwnerDrawn *GetItem(size_t n) const { return m_aItems[n]; }

 #endif
 
   virtual void Append(const wxString& item);
   virtual void Append(const wxString& item, char *clientData);
 #endif
 
   virtual void Append(const wxString& item);
   virtual void Append(const wxString& item, char *clientData);

-  virtual void Set(const int n, const wxString* choices, char **clientData = NULL);
+  virtual void Set(int n, const wxString* choices, char **clientData = NULL);

   virtual int FindString(const wxString& s) const ;
   virtual void Clear(void);
   virtual int FindString(const wxString& s) const ;
   virtual void Clear(void);

-  virtual void SetSelection(const int n, const bool select = TRUE);
+  virtual void SetSelection(int n, bool select = TRUE);

 
 

-  virtual void Deselect(const int n);
+  virtual void Deselect(int n);

 
   // For single choice list item only
   virtual int GetSelection() const ;
 
   // For single choice list item only
   virtual int GetSelection() const ;

-  virtual void Delete(const int n);
-  virtual char *GetClientData(const int n) const ;
-  virtual void SetClientData(const int n, char *clientData);
-  virtual void SetString(const int n, const wxString& s);
+  virtual void Delete(int n);
+  virtual char *GetClientData(int n) const ;
+  virtual void SetClientData(int n, char *clientData);
+  virtual void SetString(int n, const wxString& s);

 
   // For single or multiple choice list item
   virtual int GetSelections(wxArrayInt& aSelections) const;
 
   // For single or multiple choice list item
   virtual int GetSelections(wxArrayInt& aSelections) const;

-  virtual bool Selected(const int n) const ;
-  virtual wxString GetString(const int n) const ;
-  virtual void SetSize(const int x, const int y, const int width, const int height, const int sizeFlags = wxSIZE_AUTO);
+  virtual bool Selected(int n) const ;
+  virtual wxString GetString(int n) const ;
+  virtual void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
+  void SetSize(const wxRect& rect, int sizeFlags = wxSIZE_AUTO)
+    { wxWindow::SetSize(rect, sizeFlags); }
+  void SetSize(const wxSize& size) { wxWindow::SetSize(size); }

 
   // Set the specified item at the first visible item
   // or scroll to max range.
 
   // Set the specified item at the first visible item
   // or scroll to max range.

-  virtual void SetFirstItem(const int n) ;
+  virtual void SetFirstItem(int n) ;

   virtual void SetFirstItem(const wxString& s) ;
 
   virtual void SetFirstItem(const wxString& s) ;
 

-  virtual void InsertItems(const int nItems, const wxString items[], const int pos);
+  virtual void InsertItems(int nItems, const wxString items[], int pos);

 
   virtual wxString GetStringSelection(void) const ;
 
   virtual wxString GetStringSelection(void) const ;

-  virtual bool SetStringSelection(const wxString& s, const bool flag = TRUE);
+  virtual bool SetStringSelection(const wxString& s, bool flag = TRUE);

   virtual int Number(void) const ;
 
   void Command(wxCommandEvent& event);
   virtual int Number(void) const ;
 
   void Command(wxCommandEvent& event);


@@ -116,7 +124,7 @@ class WXDLLEXPORT wxListBox: public wxControl
   // Otherwise, all strings are used.
   virtual void SetHorizontalExtent(const wxString& s = wxEmptyString);
 
   // Otherwise, all strings are used.
   virtual void SetHorizontalExtent(const wxString& s = wxEmptyString);
 

-  virtual WXHBRUSH OnCtlColor(const WXHDC pDC, const WXHWND pWnd, const WXUINT nCtlColor,
+  virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,

                        WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
 
   virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
                        WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
 
   virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);


@@ -126,7 +134,7 @@ class WXDLLEXPORT wxListBox: public wxControl
   int m_noItems;
   int m_selected;
 
   int m_noItems;
   int m_selected;
 

-#if USE_OWNER_DRAWN
+#if wxUSE_OWNER_DRAWN

   // control items
   wxListBoxItemsArray m_aItems;
 #endif
   // control items
   wxListBoxItemsArray m_aItems;
 #endif


@@ -134,4 +142,4 @@ class WXDLLEXPORT wxListBox: public wxControl
 };
 
 #endif
 };
 
 #endif

-    // __LISTBOXH__
+    // _WX_LISTBOX_H_