From 3a97d2db67e638e250c3d38ffa149d6a9feb681b Mon Sep 17 00:00:00 2001
From: Robert Roebling <robert@roebling.de>
Date: Tue, 8 Jul 2003 11:18:42 +0000
Subject: [PATCH]   Upported mouse click detection change for wxChoice.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21753 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/generic/dcpsg.h | 21 ++++++++++++++-------
 include/wx/gtk/choice.h    |  1 +
 include/wx/gtk1/choice.h   |  1 +
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/include/wx/generic/dcpsg.h b/include/wx/generic/dcpsg.h
index 2dd1ca4ff9..b86487bf85 100644
--- a/include/wx/generic/dcpsg.h
+++ b/include/wx/generic/dcpsg.h
@@ -38,17 +38,18 @@ class wxPostScriptDC;
 class WXDLLEXPORT wxPostScriptDC: public wxDC
 {
 public:
-  wxPostScriptDC();
+    wxPostScriptDC();
 
-  // Recommended constructor
-  wxPostScriptDC(const wxPrintData& printData);
+    // Recommended constructor
+    wxPostScriptDC(const wxPrintData& printData);
   
-  ~wxPostScriptDC();
+    // Recommended destructor :-)
+    ~wxPostScriptDC();
 
 #if WXWIN_COMPATIBILITY_2_2
-  wxPostScriptDC( const wxString &output, bool interactive = FALSE, wxWindow *parent = NULL )
-      { Create( output, interactive, parent ); }
-  bool Create ( const wxString &output, bool interactive = FALSE, wxWindow *parent = NULL );
+    wxPostScriptDC( const wxString &output, bool interactive = FALSE, wxWindow *parent = NULL )
+        { Create( output, interactive, parent ); }
+    bool Create ( const wxString &output, bool interactive = FALSE, wxWindow *parent = NULL );
 #endif
 
   virtual bool Ok() const;
@@ -132,6 +133,12 @@ private:
     static float ms_PSScaleFactor;
 
 protected:
+#if wxUSE_PANGO
+    PangoContext *m_context;
+    PangoLayout *m_layout;
+    PangoFontDescription *m_fontdesc;
+#endif
+
     FILE*             m_pstream;    // PostScript output stream
     wxString          m_title;
     unsigned char     m_currentRed;
diff --git a/include/wx/gtk/choice.h b/include/wx/gtk/choice.h
index 5f550d732a..95a7154bcb 100644
--- a/include/wx/gtk/choice.h
+++ b/include/wx/gtk/choice.h
@@ -69,6 +69,7 @@ protected:
 
     virtual wxSize DoGetBestSize() const;
 
+    virtual bool IsOwnGtkWindow( GdkWindow *window );
 private:
     // common part of Create() and DoAppend()
     int GtkAddHelper(GtkWidget *menu, int pos, const wxString& item);
diff --git a/include/wx/gtk1/choice.h b/include/wx/gtk1/choice.h
index 5f550d732a..95a7154bcb 100644
--- a/include/wx/gtk1/choice.h
+++ b/include/wx/gtk1/choice.h
@@ -69,6 +69,7 @@ protected:
 
     virtual wxSize DoGetBestSize() const;
 
+    virtual bool IsOwnGtkWindow( GdkWindow *window );
 private:
     // common part of Create() and DoAppend()
     int GtkAddHelper(GtkWidget *menu, int pos, const wxString& item);
-- 
2.45.2