Rewrote wxNotebook, incl. PAGE_CHANGING event

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

diff --git a/include/wx/msw/combobox.h b/include/wx/msw/combobox.h
index d659f8c372c74fa2ca4e1dea9599e84951ab5543..a44538e7ff5633615260b9e1c45b36de46c1b6b2 100644 (file)
--- a/include/wx/msw/combobox.h
+++ b/include/wx/msw/combobox.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 __COMBOBOXH__
-#define __COMBOBOXH__
+#ifndef _WX_COMBOBOX_H_
+#define _WX_COMBOBOX_H_

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


@@ -18,10 +18,10 @@
 
 #include "wx/choice.h"
 
 
 #include "wx/choice.h"
 

-#if USE_COMBOBOX
+#if wxUSE_COMBOBOX

 
 

-WXDLLEXPORT_DATA(extern const char*) wxComboBoxNameStr;
-WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
+WXDLLEXPORT_DATA(extern const wxChar*) wxComboBoxNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;

 
 // Combobox item
 class WXDLLEXPORT wxComboBox: public wxChoice
 
 // Combobox item
 class WXDLLEXPORT wxComboBox: public wxChoice


@@ -31,24 +31,24 @@ class WXDLLEXPORT wxComboBox: public wxChoice
  public:
   inline wxComboBox(void) {}
 
  public:
   inline wxComboBox(void) {}
 

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

            const wxString& value = wxEmptyString,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            const wxString& value = wxEmptyString,
            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 = wxComboBoxNameStr)
   {
     Create(parent, id, value, pos, size, n, choices, style, validator, name);
   }
 
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxComboBoxNameStr)
   {
     Create(parent, id, value, pos, size, n, choices, style, validator, name);
   }
 

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

            const wxString& value = wxEmptyString,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            const wxString& value = wxEmptyString,
            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 = wxComboBoxNameStr);
 
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxComboBoxNameStr);
 


@@ -62,18 +62,22 @@ class WXDLLEXPORT wxComboBox: public wxChoice
   virtual void Copy(void);
   virtual void Cut(void);
   virtual void Paste(void);
   virtual void Copy(void);
   virtual void Cut(void);
   virtual void Paste(void);

-  virtual void SetInsertionPoint(const long pos);
+  virtual void SetInsertionPoint(long pos);

   virtual void SetInsertionPointEnd(void);
   virtual long GetInsertionPoint(void) const ;
   virtual long GetLastPosition(void) const ;
   virtual void SetInsertionPointEnd(void);
   virtual long GetInsertionPoint(void) const ;
   virtual long GetLastPosition(void) const ;

-  virtual void Replace(const long from, const long to, const wxString& value);
-  virtual void Remove(const long from, const long to);
-  virtual void SetSelection(const long from, const long to);
-  virtual void SetEditable(const bool editable);
+  virtual void Replace(long from, long to, const wxString& value);
+  virtual void Remove(long from, long to);
+  virtual void SetSelection(int n)
+  {
+    wxChoice::SetSelection(n);
+  }
+  virtual void SetSelection(long from, long to);
+  virtual void SetEditable(bool editable);

 
 

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

 };
 
 };
 

-#endif // USE_COMBOBOX
+#endif // wxUSE_COMBOBOX

 #endif
 #endif

-    // __COMBOBOXH__
+    // _WX_COMBOBOX_H_