Applied patch [ 858324 ] Calling EndModal inside an EVT_INIT_DIALOG event handler

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

diff --git a/include/wx/gtk1/choice.h b/include/wx/gtk1/choice.h
index 279e80d7fb79a0beede6ef4e3367ca63611e06b7..a6e0ecd1beb46ae62c3d6e9f41c23bfe75a87f47 100644 (file)
--- a/include/wx/gtk1/choice.h
+++ b/include/wx/gtk1/choice.h
@@ -10,10 +10,12 @@
 #ifndef __GTKCHOICEH__
 #define __GTKCHOICEH__
 
 #ifndef __GTKCHOICEH__
 #define __GTKCHOICEH__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "choice.h"
 #endif
 
     #pragma interface "choice.h"
 #endif
 

+class WXDLLIMPEXP_BASE wxSortedArrayString;
+

 //-----------------------------------------------------------------------------
 // wxChoice
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxChoice
 //-----------------------------------------------------------------------------


@@ -60,6 +62,7 @@ protected:
 
     void ApplyWidgetStyle();
     virtual int DoAppend(const wxString& item);
 
     void ApplyWidgetStyle();
     virtual int DoAppend(const wxString& item);

+    virtual int DoInsert(const wxString& item, int pos);

 
     virtual void DoSetItemClientData( int n, void* clientData );
     virtual void* DoGetItemClientData( int n ) const;
 
     virtual void DoSetItemClientData( int n, void* clientData );
     virtual void* DoGetItemClientData( int n ) const;


@@ -68,9 +71,10 @@ protected:
 
     virtual wxSize DoGetBestSize() const;
 
 
     virtual wxSize DoGetBestSize() const;
 

+    virtual bool IsOwnGtkWindow( GdkWindow *window );

 private:
     // common part of Create() and DoAppend()
 private:
     // common part of Create() and DoAppend()

-    size_t GtkAppendHelper(GtkWidget *menu, const wxString& item);
+    int GtkAddHelper(GtkWidget *menu, int pos, const wxString& item);

 
     // this array is only used for controls with wxCB_SORT style, so only
     // allocate it if it's needed (hence using pointer)
 
     // this array is only used for controls with wxCB_SORT style, so only
     // allocate it if it's needed (hence using pointer)