Only declare wxDialog::SetWindowStyleFlag() when wxUSE_DIALOG_SIZEGRIP.

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

diff --git a/include/wx/msw/combo.h b/include/wx/msw/combo.h
index ce07dd572ae0bc77a1c04695e6e2040eedf606a9..f30bc1a30993cc0629a52c38fb8096de21240dc3 100644 (file)
--- a/include/wx/msw/combo.h
+++ b/include/wx/msw/combo.h
@@ -33,9 +33,9 @@
 // Define this only if native implementation includes all features
 #define wxCOMBOCONTROL_FULLY_FEATURED
 
 // Define this only if native implementation includes all features
 #define wxCOMBOCONTROL_FULLY_FEATURED
 

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

 
 

-class WXDLLEXPORT wxComboCtrl : public wxComboCtrlBase
+class WXDLLIMPEXP_CORE wxComboCtrl : public wxComboCtrlBase

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


@@ -73,22 +73,29 @@ public:
     static int GetFeatures() { return wxComboCtrlFeatures::All; }
 
 #if wxUSE_COMBOCTRL_POPUP_ANIMATION
     static int GetFeatures() { return wxComboCtrlFeatures::All; }
 
 #if wxUSE_COMBOCTRL_POPUP_ANIMATION

-    void OnTimerEvent( wxTimerEvent& event );
+    void OnTimerEvent(wxTimerEvent& WXUNUSED(event)) { DoTimerEvent(); }
+

 protected:
 protected:

+    void DoTimerEvent();
+

     virtual bool AnimateShow( const wxRect& rect, int flags );
     virtual bool AnimateShow( const wxRect& rect, int flags );

-#endif
+#endif // wxUSE_COMBOCTRL_POPUP_ANIMATION

 
 protected:
 
 
 protected:
 

+    // Dummy method - we override all functions that call this
+    virtual WXHWND GetEditHWND() const { return NULL; }
+

     // customization
     virtual void OnResize();
     virtual wxCoord GetNativeTextIndent() const;
     // customization
     virtual void OnResize();
     virtual wxCoord GetNativeTextIndent() const;

-    virtual void OnThemeChange();

 
     // event handlers
     void OnPaintEvent( wxPaintEvent& event );
     void OnMouseEvent( wxMouseEvent& event );
 
 
     // event handlers
     void OnPaintEvent( wxPaintEvent& event );
     void OnMouseEvent( wxMouseEvent& event );
 

+    virtual bool HasTransparentBackground() { return IsDoubleBuffered(); }
+

 private:
     void Init();
 
 private:
     void Init();