Index: CHANGELOG.txt
===================================================================
RCS file: /projects/pgadmin3/CHANGELOG.txt,v
retrieving revision 1.163
retrieving revision 1.164
diff -LCHANGELOG.txt -LCHANGELOG.txt -u -w -r1.163 -r1.164
--- CHANGELOG.txt
+++ CHANGELOG.txt
@@ -17,6 +17,7 @@
+ - 2004-11-10 AP 1.2RC2 Fix OSX issue (r: Patrick Hatcher)
- 2004-11-09 AP 1.2RC2 Fix remembering SSL connection parameter (r: Justin Clift)
- 2004-11-09 AP 1.2RC2 Fix GTK comboboxes (r: Tim Booth)
- 2004-11-05 AP 1.2RC2 Disable changing parameters of connected servers
Index: ctlComboBox.h
===================================================================
RCS file: /projects/pgadmin3/src/include/ctlComboBox.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -Lsrc/include/ctlComboBox.h -Lsrc/include/ctlComboBox.h -u -w -r1.4 -r1.5
--- src/include/ctlComboBox.h
+++ src/include/ctlComboBox.h
@@ -37,10 +37,7 @@
#ifdef __WXMSW__
wxString GetValue() const { return wxGetWindowText(GetHwnd()); }
#endif
-private:
- // MS VC6 will call wxComboBox::GetSelection instead, so we can't overload these.
int GetSelection() const;
- wxString GetStringSelection() const;
};
#endif