BC++/16-bit support now working, but without resource system

[wxWidgets.git] / include / wx / gtk1 / control.h

diff --git a/include/wx/gtk1/control.h b/include/wx/gtk1/control.h
index a40bbf3aae3605c9736f041129fc8f08ef4a0a15..d3a164d27500d988b313ccf7488780c4da686f3f 100644 (file)
--- a/include/wx/gtk1/control.h
+++ b/include/wx/gtk1/control.h
@@ -2,13 +2,11 @@
 // Name:        control.h
 // Purpose:
 // Author:      Robert Roebling
 // Name:        control.h
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling, Julian Smart

 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-

 #ifndef __GTKCONTROLH__
 #define __GTKCONTROLH__
 
 #ifndef __GTKCONTROLH__
 #define __GTKCONTROLH__
 


@@ -33,19 +31,25 @@ class wxControl;
 
 class wxControl: public wxWindow
 {
 
 class wxControl: public wxWindow
 {

-  DECLARE_DYNAMIC_CLASS(wxControl)
-
-  public:
+DECLARE_DYNAMIC_CLASS(wxControl)

 
 

-    wxControl(void);
-    wxControl( wxWindow *parent, wxWindowID id, 
+public:
+  wxControl();
+  wxControl( wxWindow *parent, wxWindowID id, 

       const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, 
       long style = 0, const wxString &name = wxPanelNameStr  );
       const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, 
       long style = 0, const wxString &name = wxPanelNameStr  );

-    virtual void Command( wxCommandEvent &event );
-    virtual void SetLabel( const wxString &label );
-    virtual wxString GetLabel(void) const;
-    
-    wxString   m_label;
+  
+  virtual void Command( wxCommandEvent &event );
+
+    // this function will filter out '&' characters and will put the accelerator
+    // char (the one immediately after '&') into m_chAccel (@@ not yet)
+  virtual void SetLabel( const wxString &label );
+  virtual wxString GetLabel() const;
+  
+protected:
+  wxString   m_label;
+  char       m_chAccel;  // enabled to avoid breaking binary compatibility later on
+  

 };
 
 #endif // __GTKCONTROLH__
 };
 
 #endif // __GTKCONTROLH__