marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Drop some dead code in C4App.h and C4WindowGTK.cpp

objectmenu
Günther Brammer 2016-01-22 22:55:17 +01:00
parent 1c15b8f661
commit aa931ac623
2 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/platform/C4App.h
View File

@ -170,21 +170,12 @@ public:
private:
CStdMessageProc MessageProc;
public:
/* bool IsShiftDown() { return GetKeyState(VK_SHIFT) < 0; }
bool IsControlDown() { return GetKeyState(VK_CONTROL) < 0; }
bool IsAltDown() { return GetKeyState(VK_MENU) < 0; }*/
PIXELFORMATDESCRIPTOR &GetPFD() { return pfd; }
HMONITOR hMon; // monitor handle of used monitor
RECT MonitorRect; // output window rect
protected:
PIXELFORMATDESCRIPTOR pfd; // desired pixel format
DEVMODEW dspMode, OldDspMode;// display mode for fullscreen
#else
public:
/* bool IsShiftDown() { return KeyMask & MK_SHIFT; }
bool IsControlDown() { return KeyMask & MK_CONTROL; }
bool IsAltDown() { return KeyMask & MK_ALT; }
unsigned int KeyMask;*/
#endif
protected:

14
src/platform/C4WindowGTK.cpp
View File

@ -49,8 +49,6 @@
// Some helper functions for choosing a proper visual
#ifndef USE_CONSOLE
namespace {
static const std::map<int, int> base_attrib_map {
{GLX_DRAWABLE_TYPE, GLX_WINDOW_BIT},
@ -118,7 +116,6 @@ GLXFBConfig PickGLXFBConfig(Display* dpy, int multisampling)
}
}
#endif // #ifndef USE_CONSOLE
static void OnDestroyStatic(GtkWidget* widget, gpointer data)
{
C4Window* wnd = static_cast<C4Window*>(data);
@ -545,7 +542,6 @@ C4Window::~C4Window ()
bool C4Window::FindFBConfig(int samples, GLXFBConfig *info)
{
#ifndef USE_CONSOLE
Display * const dpy = gdk_x11_display_get_xdisplay(gdk_display_get_default());
GLXFBConfig config = PickGLXFBConfig(dpy, samples);
if (info)
@ -553,16 +549,12 @@ bool C4Window::FindFBConfig(int samples, GLXFBConfig *info)
*info = config;
}
return config != NULL;
#else
// TODO: Do we need to handle this case?
#endif // #ifndef USE_CONSOLE
return false;
}
void C4Window::EnumerateMultiSamples(std::vector<int>& samples) const
{
#ifndef USE_CONSOLE
Display * const dpy = gdk_x11_display_get_xdisplay(gdk_display_get_default());
std::map<int, int> attribs = base_attrib_map;
attribs[GLX_SAMPLE_BUFFERS_ARB] = 1;
@ -580,7 +572,6 @@ void C4Window::EnumerateMultiSamples(std::vector<int>& samples) const
XFree(configs);
samples.assign(multisamples.cbegin(), multisamples.cend());
#endif
}
bool C4Window::StorePosition(const char *, const char *, bool) { return true; }
@ -797,14 +788,11 @@ bool C4Window::ReInit(C4AbstractApp* pApp)
{
// Check whether multisampling settings was changed. If not then we
// don't need to ReInit anything.
#ifndef USE_CONSOLE
int value;
Display * const dpy = gdk_x11_display_get_xdisplay(gdk_display_get_default());
glXGetFBConfigAttrib(dpy, Info, GLX_SAMPLES, &value);
if(value == Config.Graphics.MultiSampling) return true;
#else
return true;
#endif
// Check whether we have a visual with the requested number of samples
GLXFBConfig new_info;
if(!FindFBConfig(Config.Graphics.MultiSampling, &new_info)) return false;