Corrected wxScrolledWindow's OnSize behaviour.

[wxWidgets.git] / src / generic / fontdlgg.cpp

diff --git a/src/generic/fontdlgg.cpp b/src/generic/fontdlgg.cpp
index 38e54e92099ad5878b3348fbe1154d6ed5790208..91ad7da07bd6cb110540dfa953e4a69b0e313aeb 100644 (file)
--- a/src/generic/fontdlgg.cpp
+++ b/src/generic/fontdlgg.cpp
@@ -20,6 +20,8 @@
 #pragma hdrstop
 #endif
 
+#if wxUSE_FONTDLG && (!defined(__WXGTK__) || defined(__WXUNIVERSAL__))
+
 #ifndef WX_PRECOMP
 #include <stdio.h>
 #include "wx/utils.h"
@@ -31,7 +33,7 @@
 #include "wx/dcclient.h"
 #include "wx/choice.h"
 #include "wx/checkbox.h"
-#include <wx/intl.h>
+#include "wx/intl.h"
 #endif
 
 #include <string.h>
@@ -40,7 +42,6 @@
 #include "wx/cmndata.h"
 #include "wx/generic/fontdlgg.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxGenericFontDialog, wxDialog)
 
 BEGIN_EVENT_TABLE(wxGenericFontDialog, wxDialog)
@@ -54,7 +55,6 @@ BEGIN_EVENT_TABLE(wxGenericFontDialog, wxDialog)
     EVT_CLOSE(wxGenericFontDialog::OnCloseWindow)
 END_EVENT_TABLE()
 
-#endif
 
 #define NUM_COLS 48
 static wxString wxColourDialogNames[NUM_COLS]={wxT("ORANGE"),
@@ -371,7 +371,6 @@ wxChar *wxFontWeightIntToString(int weight)
     default:
       return wxT("Normal");
   }
-  return wxT("Normal");
 }
 
 wxChar *wxFontStyleIntToString(int style)
@@ -386,7 +385,6 @@ wxChar *wxFontStyleIntToString(int style)
     default:
       return wxT("Normal");
   }
-  return wxT("Normal");
 }
 
 wxChar *wxFontFamilyIntToString(int family)
@@ -407,7 +405,6 @@ wxChar *wxFontFamilyIntToString(int family)
     default:
       return wxT("Swiss");
   }
-  return wxT("Swiss");
 }
 
 int wxFontFamilyStringToInt(wxChar *family)
@@ -452,4 +449,6 @@ int wxFontWeightStringToInt(wxChar *weight)
     return wxNORMAL;
 }
 
+#endif
+    // wxUSE_FONTDLG