fixed (rare but fatal) bug in wxWindowDisabler

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

diff --git a/src/generic/fontdlgg.cpp b/src/generic/fontdlgg.cpp
index e71f4562e61d7fd0cae3c18449d1c16e6f4ef9b2..a7c96f96672a7095513628e31b7afae0b823bc43 100644 (file)
--- a/src/generic/fontdlgg.cpp
+++ b/src/generic/fontdlgg.cpp
@@ -31,7 +31,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 +40,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 +53,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"),
@@ -164,7 +162,7 @@ int wxGenericFontDialog::ShowModal(void)
 }
 
 
-void wxGenericFontDialog::OnPaint(wxPaintEvent& event)
+void wxGenericFontDialog::OnPaint(wxPaintEvent& WXUNUSED(event))
 {
   wxPaintDC dc(this);
   PaintFontBackground(dc);
@@ -371,7 +369,6 @@ wxChar *wxFontWeightIntToString(int weight)
     default:
       return wxT("Normal");
   }
-  return wxT("Normal");
 }
 
 wxChar *wxFontStyleIntToString(int style)
@@ -386,7 +383,6 @@ wxChar *wxFontStyleIntToString(int style)
     default:
       return wxT("Normal");
   }
-  return wxT("Normal");
 }
 
 wxChar *wxFontFamilyIntToString(int family)
@@ -407,7 +403,6 @@ wxChar *wxFontFamilyIntToString(int family)
     default:
       return wxT("Swiss");
   }
-  return wxT("Swiss");
 }
 
 int wxFontFamilyStringToInt(wxChar *family)