use a GtkAlignment to position m_mainWidget, avoiding need to re-size_allocate it

[wxWidgets.git] / include / wx / generic / combo.h

diff --git a/include/wx/generic/combo.h b/include/wx/generic/combo.h
index feca13db3c20b19c5245f8549f5bb540e8bd0a5d..fc7bb1088209efbfd58dd4edaf43721c0ba3f997 100644 (file)
--- a/include/wx/generic/combo.h
+++ b/include/wx/generic/combo.h
@@ -9,8 +9,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef _WX_GENERIC_COMBOCONTROL_H_
-#define _WX_GENERIC_COMBOCONTROL_H_
+#ifndef _WX_GENERIC_COMBOCTRL_H_
+#define _WX_GENERIC_COMBOCTRL_H_

 
 #if wxUSE_COMBOCTRL
 
 
 #if wxUSE_COMBOCTRL
 


@@ -31,22 +31,22 @@
 
 #endif
 
 
 #endif
 

-extern WXDLLIMPEXP_DATA_CORE(const wxChar) wxComboBoxNameStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxComboBoxNameStr[];

 
 

-class WXDLLEXPORT wxGenericComboControl : public wxComboCtrlBase
+class WXDLLEXPORT wxGenericComboCtrl : public wxComboCtrlBase

 {
 public:
     // ctors and such
 {
 public:
     // ctors and such

-    wxGenericComboControl() : wxComboCtrlBase() { Init(); }
-
-    wxGenericComboControl(wxWindow *parent,
-                          wxWindowID id = wxID_ANY,
-                          const wxString& value = wxEmptyString,
-                          const wxPoint& pos = wxDefaultPosition,
-                          const wxSize& size = wxDefaultSize,
-                          long style = 0,
-                          const wxValidator& validator = wxDefaultValidator,
-                          const wxString& name = wxComboBoxNameStr)
+    wxGenericComboCtrl() : wxComboCtrlBase() { Init(); }
+
+    wxGenericComboCtrl(wxWindow *parent,
+                       wxWindowID id = wxID_ANY,
+                       const wxString& value = wxEmptyString,
+                       const wxPoint& pos = wxDefaultPosition,
+                       const wxSize& size = wxDefaultSize,
+                       long style = 0,
+                       const wxValidator& validator = wxDefaultValidator,
+                       const wxString& name = wxComboBoxNameStr)

         : wxComboCtrlBase()
     {
         Init();
         : wxComboCtrlBase()
     {
         Init();


@@ -63,7 +63,11 @@ public:
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxComboBoxNameStr);
 
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxComboBoxNameStr);
 

-    virtual ~wxGenericComboControl();
+    virtual ~wxGenericComboCtrl();
+
+    void SetCustomPaintWidth( int width );
+
+    virtual bool IsKeyPopupToggle(const wxKeyEvent& event) const;

 
     static int GetFeatures() { return wxComboCtrlFeatures::All; }
 
 
     static int GetFeatures() { return wxComboCtrlFeatures::All; }
 


@@ -88,7 +92,7 @@ private:
 
     DECLARE_EVENT_TABLE()
 
 
     DECLARE_EVENT_TABLE()
 

-    DECLARE_DYNAMIC_CLASS(wxGenericComboControl)
+    DECLARE_DYNAMIC_CLASS(wxGenericComboCtrl)

 };
 
 
 };
 
 


@@ -97,20 +101,20 @@ private:
 // If native wxComboCtrl was not defined, then prepare a simple
 // front-end so that wxRTTI works as expected.
 
 // If native wxComboCtrl was not defined, then prepare a simple
 // front-end so that wxRTTI works as expected.
 

-class WXDLLEXPORT wxComboCtrl : public wxGenericComboControl
+class WXDLLEXPORT wxComboCtrl : public wxGenericComboCtrl

 {
 public:
 {
 public:

-    wxComboCtrl() : wxGenericComboControl() {}
+    wxComboCtrl() : wxGenericComboCtrl() {}

 
     wxComboCtrl(wxWindow *parent,
 
     wxComboCtrl(wxWindow *parent,

-                   wxWindowID id = wxID_ANY,
-                   const wxString& value = wxEmptyString,
-                   const wxPoint& pos = wxDefaultPosition,
-                   const wxSize& size = wxDefaultSize,
-                   long style = 0,
-                   const wxValidator& validator = wxDefaultValidator,
-                   const wxString& name = wxComboBoxNameStr)
-        : wxGenericComboControl()
+                wxWindowID id = wxID_ANY,
+                const wxString& value = wxEmptyString,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = 0,
+                const wxValidator& validator = wxDefaultValidator,
+                const wxString& name = wxComboBoxNameStr)
+        : wxGenericComboCtrl()

     {
         (void)Create(parent, id, value, pos, size, style, validator, name);
     }
     {
         (void)Create(parent, id, value, pos, size, style, validator, name);
     }


@@ -127,10 +131,10 @@ private:
 
 #else
 
 
 #else
 

-#define wxGenericComboControl   wxComboCtrl
+#define wxGenericComboCtrl   wxComboCtrl

 
 #endif // !defined(wxCOMBOCONTROL_FULLY_FEATURED)
 
 #endif // wxUSE_COMBOCTRL
 #endif
 
 #endif // !defined(wxCOMBOCONTROL_FULLY_FEATURED)
 
 #endif // wxUSE_COMBOCTRL
 #endif

-    // _WX_GENERIC_COMBOCONTROL_H_
+    // _WX_GENERIC_COMBOCTRL_H_